Merge branch 'maint'
commitcb62841e06c6c8dbecd9a3366c8c0ff9e79fe855
authorBastien Guerry <bzg@altern.org>
Fri, 26 Apr 2013 14:44:15 +0000 (26 16:44 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 26 Apr 2013 14:44:15 +0000 (26 16:44 +0200)
tree08180ef1c8e81a49d6a15867ec542a361bb0a7b9
parentcb42a48a308b80928cbdb42968e6ffad5eb5142d
parente6ab7869f760872708525d7510ddc861616c829a
Merge branch 'maint'