Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sun, 9 Dec 2012 22:48:29 +0000 (23:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 9 Dec 2012 22:48:29 +0000 (23:48 +0100)
commit48703624d5a7f13e5408debd2f01dbf7ac6020f4
treeaa16651770884e911d8c0cf929a6562517de21a2
parent66c6642e68f77f222c4f3c7b13d07083823ef8fc
parente5ea08f01b7e9075dde7ee7887b84cb752e2d8e2
Merge branch 'maint'

Conflicts:
doc/org.texi
doc/org.texi