Merge branch 'maint'
commit3c4a99c7312293a11431d8e357faa91a6f1f04c0
authorBastien Guerry <bzg@altern.org>
Thu, 2 Jan 2014 15:08:36 +0000 (2 16:08 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 2 Jan 2014 15:08:36 +0000 (2 16:08 +0100)
tree399eb3b31a5ff4375c8a91c1e62b03675bc04204
parent13bb11695b45e6b3f4fb849c499259f9ed3d7dd4
parenta66028dfc5b8335d5b5430089f1d6ccfbd257558
Merge branch 'maint'
doc/org.texi