Merge branch 'maint'
commit86170ff501bd267318959e24936a496a59e48d80
authorBastien <bzg@gnu.org>
Sun, 16 Aug 2015 14:02:20 +0000 (16 16:02 +0200)
committerBastien <bzg@gnu.org>
Sun, 16 Aug 2015 14:02:20 +0000 (16 16:02 +0200)
tree2259b3bcf7c2ce9683a118105afb02ced168a6c4
parent97ae158e88ac278e755b85a45c107b180d63d9b7
parent55544780e28a157aea0218cb8045ebfdcb6d98ab
Merge branch 'maint'
doc/org.texi
etc/ORG-NEWS