Merge branch 'maint'
commit09167e96c09f43ff2231272787e5cce08a153122
authorBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 17:11:05 +0000 (29 19:11 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 17:11:05 +0000 (29 19:11 +0200)
treed33c188b70ff92a6663287a814a3f26439870156
parent69615a7147bf3c41bdc526e8f000804ec69b6a92
parentaf51c11ba96fb2d925722a0e3353b9af5b60a3e6
Merge branch 'maint'