Merge branch 'maint'
commit1f4b6a1e03776e534503f5aa3fec73134618c434
authorBastien Guerry <bzg@altern.org>
Wed, 8 Jan 2014 15:12:28 +0000 (8 16:12 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 8 Jan 2014 15:12:28 +0000 (8 16:12 +0100)
treeb31a34cc924853fda9d4b099a66fe5f79f2266dc
parenta24e6420bedcf2e18362e7d9aeb69a65b8fcf873
parente5b84d14cda48bb740b1df1f5eaaabe92dbbf121
Merge branch 'maint'