Merge branch 'master' of orgmode.org:org-mode
commit1094a5eab79e611e04b8e4d19a4963c813928560
authorBastien Guerry <bzg@altern.org>
Fri, 1 Mar 2013 16:16:56 +0000 (1 17:16 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 1 Mar 2013 16:16:56 +0000 (1 17:16 +0100)
tree5ef4d42d948b03d86a53c28d43e7e709c458f7ca
parent1dfdbe331a21671e6aa3854e1980f18271048884
parent8a3e72208a0e16b0086b46b4384784bd8f5fff05
Merge branch 'master' of orgmode.org:org-mode