Merge branch 'maint'
commit3f81fe855b881138e9ac5d05817c5f8e4fbd28c6
authorBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 17:02:26 +0000 (29 19:02 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 17:02:26 +0000 (29 19:02 +0200)
treec89796d76ccb7e9cafd1ecb1fd3155433dd22feb
parent188dc72b2d66391a3539b71604e4b595e33c9f72
parenta9f590e7b13f8f61651a1645b81d7520c589b310
Merge branch 'maint'