Merged from master
authorSébastien Grignard <seb@amakaze.org>
Fri, 10 Jan 2014 22:05:03 +0000 (23:05 +0100)
committerSébastien Grignard <seb@amakaze.org>
Fri, 10 Jan 2014 22:05:03 +0000 (23:05 +0100)
commit809106bb9b0096961893df8d3daa3ca6de544667
tree96140784e4550e5f3c12dd6a3d26082590de80d3
parent3ebd74095d2f6ea9c2af827f35a227b7eec580d3
parent25cade281bfb2e3d22885dbe0a9991377652f386
Merged from master