Merge branch 'master' of orgmode.org:org-mode
commit9662b7db1c032785b78cbcaf7aa414da165ff05a
authorBastien Guerry <bzg@altern.org>
Sat, 13 Apr 2013 00:11:42 +0000 (13 02:11 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 13 Apr 2013 00:11:42 +0000 (13 02:11 +0200)
treefe72403c7b3c98215adf107f2810df10b88cd69a
parente82fb4402c2b231a3371a45c083ad93cf5b15400
parentc35168ed3ffd3272c06e2c17f865fb159d62726c
Merge branch 'master' of orgmode.org:org-mode
doc/org.texi