Merge branch 'maint'
commitc8452bfca08a834a4dc452de6040e0956d3770e3
authorBastien Guerry <bzg@altern.org>
Sat, 15 Dec 2012 07:05:02 +0000 (15 08:05 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 15 Dec 2012 07:05:02 +0000 (15 08:05 +0100)
tree0c2a73a1828377c7c58586bb0f582d15fc3b1d96
parente77f26e121bca79b400e60fedd5276629319bf64
parentc0675b478ed4bcdac16cf5349d035a141048cadc
Merge branch 'maint'