Merge branch 'maint'
commite183bb08f5554ca489c01d5ca881f6b4b184ee71
authorBastien Guerry <bzg@altern.org>
Sat, 22 Mar 2014 08:40:51 +0000 (22 09:40 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 22 Mar 2014 08:40:51 +0000 (22 09:40 +0100)
treec95f01e74ebe5afd24a401a61f4f72f17e30368b
parent7e689ae9610fb0e97270da3a7184d59a180d0f5b
parentcb53665e553b6d8b644b2e166d97be2bab753a98
Merge branch 'maint'