Merge branch 'maint'
commit6b7d2688d9a5a056b170054bb87aeb623808cb4e
authorBastien Guerry <bzg@altern.org>
Sat, 12 Jan 2013 14:08:05 +0000 (12 15:08 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 12 Jan 2013 14:08:05 +0000 (12 15:08 +0100)
tree3bf62d9a62a89c885871c2214f98e26381a04252
parent06c98ceb6068cc92e9308b749cd8eddef09ac743
parent5e60f27a30fd1e592fdb622124fc3fc65c7d2990
Merge branch 'maint'