Merge branch 'maint'
commit2af471d7cf7ae8028fa2a878b9d03380283c6fc8
authorBastien Guerry <bzg@altern.org>
Sat, 27 Apr 2013 02:05:16 +0000 (27 04:05 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 27 Apr 2013 02:05:16 +0000 (27 04:05 +0200)
tree720cb3f7731c1846d027bae831bafa365f3544af
parent79f75b77c49e6165414205d124afa21e9ce3434e
parentcf48a620e9ca3e70c5fe97dc3bea44ab7337614d
Merge branch 'maint'