Merge branch 'maint'
commit40fdea9b0d9d47aaabc9037ee91039853d177715
authorBastien Guerry <bzg@altern.org>
Fri, 28 Sep 2012 17:06:35 +0000 (28 19:06 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Sep 2012 17:06:35 +0000 (28 19:06 +0200)
tree0fdd7baf5f2d0854332d06dbbc38813a0309ebbc
parent7360000871e78d856cd938c30639816b12f9b94d
parent4224cb3336cfb945210a35153ff2d06a2b21b3b4
Merge branch 'maint'