Merge branch 'maint'
commitdd412491b36f36cf506e7b75f53adb7e3c6a94d3
authorBastien Guerry <bzg@altern.org>
Mon, 13 Jan 2014 22:26:33 +0000 (13 23:26 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 13 Jan 2014 22:26:33 +0000 (13 23:26 +0100)
tree2bd40ddf653fa1c45cf56190014f1ce425c8e72c
parentae0f1c56a7934cde23d30e5481510cbe79562fea
parent3f7822d31b2bd4f69e0760c183ae0e51f3b04ed7
Merge branch 'maint'
doc/org.texi