Merge branch 'master' of orgmode.org:org-mode
commit92eaf7bbd8afe1a03306ef6dd01b95973d7dc152
authorBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 21:38:47 +0000 (15 23:38 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 21:38:47 +0000 (15 23:38 +0200)
tree2d74d0426b408fd08b3bcad36ae511b95a588df1
parent600c55a039310a274c383fd348375854835e40d8
parent5e0c969381f3bb9f0bf085583c8a52805b79beec
Merge branch 'master' of orgmode.org:org-mode
doc/org.texi