Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 4 Dec 2012 14:24:43 +0000 (15:24 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 4 Dec 2012 14:24:43 +0000 (15:24 +0100)
commitdcdec74b00e401c5884fed2ea5ebb7f39134fbc5
tree59aec18455b3f620f59d73f93c3cd12dc45fcdea
parentae1b4960d1eacfa95f7c2f58cf2c91193e3190c8
parent6dfe2fef042ee1f48c55163b4943e58a8153f577
Merge branch 'maint'