Merge branch 'maint'
commite9e182a7f5d3d91a74c2d5e0b6dd78048d364788
authorBastien Guerry <bzg@altern.org>
Sun, 12 Jan 2014 11:02:57 +0000 (12 12:02 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 12 Jan 2014 11:02:57 +0000 (12 12:02 +0100)
treece7f46d4b4201f889bec95c1348b6c79cd3cf366
parent90884b9748f87acc9ad2ac8810e9b5472387ff72
parenta0610f0775a0a38b4815060371f320942213e19a
Merge branch 'maint'