Merge branch 'maint'
commiteabf8984be5009c5e630b883192ace108553fd56
authorBastien Guerry <bzg@altern.org>
Sat, 21 Apr 2012 22:44:27 +0000 (22 00:44 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 21 Apr 2012 22:44:27 +0000 (22 00:44 +0200)
treeb0eaa62c73bc46eaa637efa51aeb96e8e9dd37ba
parent6b6f0d625bfe7c2d30a5fbeb4491f43f61f49471
parent76c38183bb84c9512bc2eef428c30065263b2894
Merge branch 'maint'