Merge branch 'master' into master-wip
commitbfa47dcb9494c9a3746dcba629d6308c09c15a1d
authorBastien Guerry <bzg@altern.org>
Fri, 22 Feb 2013 11:57:16 +0000 (22 12:57 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 22 Feb 2013 11:57:16 +0000 (22 12:57 +0100)
treeef63740dcb48388784a2f0801fe914c25f0fb173
parente96ba7c4acba5969288759d3d4f03b88f0bc2f07
parent61bf4a5c3ffb827186d9a2463d316537a48ab6e2
Merge branch 'master' into master-wip