Merge branch 'maint'
commit7330e2a8a4485abcfaf86ba93c2520f46f3feafe
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 17:33:09 +0000 (8 18:33 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 17:33:09 +0000 (8 18:33 +0100)
tree148b3c2c79d1f1446990a531e96491cb2c62abdb
parentb4ff6d972764568ad33493ecb1b9a8951ea4b471
parenta5815f3f5b89d5b064af890f42fe09cb156c3959
Merge branch 'maint'