Merge branch 'maint'
commitc5016d55b6425c1e19f7f951958c0a47decddacf
authorBastien Guerry <bzg@altern.org>
Sun, 12 Oct 2014 05:03:23 +0000 (12 07:03 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 12 Oct 2014 05:03:23 +0000 (12 07:03 +0200)
tree40652d9d294ccfa287e7fdfa754b6cf3e3d78366
parent2b98cd655412f5e1ebe48cf622f60cbc00c2054d
parent9c3d22f86449d284efd5126254e4c76e43c09f48
Merge branch 'maint'