Merge branch 'master' of orgmode.org:org-mode
commit0f1064a363f013a9a6bd117c3677d0f5e3dd6b5d
authorBastien Guerry <bzg@altern.org>
Tue, 22 Apr 2014 06:46:22 +0000 (22 08:46 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Apr 2014 06:46:22 +0000 (22 08:46 +0200)
treef47a460d85d57efbb5526aff60e7e2b07c12b816
parent28b038e470152bec53b5dff22a3ac9e3d1c8880f
parent903bf2b12cf1b4304ba14b35b8197387a55f889e
Merge branch 'master' of orgmode.org:org-mode