Merge branch 'maint'
commitfeacde6c71b5dbab0fa944c97e58f5097849b15f
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 15:07:52 +0000 (20 16:07 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 15:07:52 +0000 (20 16:07 +0100)
treeaf18c104f177851145df40b725ab3453d407b748
parente5539d4d58ce6de191cf79b4f06a9559de1ee4c7
parentde84aadf8fe05588fbf806a23898075aabe38d83
Merge branch 'maint'