Merge branch 'maint'
commit2bd95b6bfc3781dddbe67934163707a016dce195
authorBastien Guerry <bzg@altern.org>
Fri, 28 Sep 2012 08:05:20 +0000 (28 10:05 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Sep 2012 08:05:20 +0000 (28 10:05 +0200)
tree34d27e02ed056c382e3fb68b864cb5d22a2c5d1f
parentacca5ddbaec0852bd17334f2091637395ba5841f
parentc173b19b05c0dc92913ad55981d1351c8d28c88a
Merge branch 'maint'