Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 4 Dec 2012 14:21:26 +0000 (15:21 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 4 Dec 2012 14:21:26 +0000 (15:21 +0100)
commitae1b4960d1eacfa95f7c2f58cf2c91193e3190c8
tree409e8142ffe74c19bfc7d60d91f296096e3a6797
parent6340615cc6022a09795f467c5b59254cc453de85
parentba7a3ef86904b9f34d38077292f037ffc0365ad1
Merge branch 'maint'