Merge branch 'maint'
commitaa500b1eaaeec071f8eb6ec3c022144d74b6249c
authorBastien Guerry <bzg@altern.org>
Thu, 27 Jun 2013 17:01:21 +0000 (27 19:01 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 27 Jun 2013 17:01:21 +0000 (27 19:01 +0200)
tree7e11a92d116ba88ad1ecd99d9835152c6a040cbc
parent85edec188612928a270e3af92c5f0c0bae9b0fec
parent21d1d4d1371c46f463a113be9fe8f22a18e4e880
Merge branch 'maint'