Merge branch 'maint'
commitf480d4781959cf4cf6270b1d7994541828e5fc1f
authorBastien Guerry <bzg@altern.org>
Fri, 24 Aug 2012 16:56:40 +0000 (24 18:56 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 24 Aug 2012 16:56:40 +0000 (24 18:56 +0200)
treeda503c1db62b71a12c57b795c3d033db6b559063
parentbb75dd9f8d46a54baa8a99be140c634bf92ef050
parentd3af5d02b0f0daa566e5e2d43d830dd33ab7c02e
Merge branch 'maint'