Merge branch 'maint'
commit7a6ceacd2d36b1578111d13ca86c0756fc00e4b8
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 18:01:36 +0000 (20 19:01 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 18:01:36 +0000 (20 19:01 +0100)
tree70b50fdd97b0ad70ff5e44d0f0441349f36b32b3
parent24dea073bc974a22000f2eac9217afcfc5da9882
parentf8aab8714123ef0b025e41dba228cde26bb4d17b
Merge branch 'maint'