Merge branch 'maint'
commitb63128a31255450914500c56cee7cebff37c419e
authorBastien Guerry <bzg@altern.org>
Wed, 19 Dec 2012 16:44:08 +0000 (19 17:44 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 19 Dec 2012 16:44:08 +0000 (19 17:44 +0100)
treeb9054cb4d62cb3e4faaf343b3e89d9367c92ec08
parentc74c62606dbe9f54abfcd8ac22e89329a2e201ef
parent23e2346c4c79ac20f6699033456420e4731f5aa5
Merge branch 'maint'