Merge branch 'maint'
commitbb591bf0a362910c0adfde000da47699bd63056e
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 17:16:02 +0000 (4 18:16 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 17:16:02 +0000 (4 18:16 +0100)
tree9f8f47f26583eb683fea2794f0e62ae82b2cf946
parent402494fbd2ff2fbc23d44a8d21dd6e41e199d16c
parent8044cfed1c29f64e0dc652dd205bf6e4dca7d367
Merge branch 'maint'