Merge branch 'master' of orgmode.org:org-mode
commit1840df2219938ae4b8efd2fcca32e7aa5a93da13
authorBastien Guerry <bzg@altern.org>
Sat, 23 Aug 2014 16:29:28 +0000 (23 18:29 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 23 Aug 2014 16:29:28 +0000 (23 18:29 +0200)
treebe051c3a3f7d6bdd1da1c69fa0b7e4fbda1af1d1
parent3e01c7ff1b37f1f548cc6c959160ff11302a25c7
parent7cf7e4454fb05ce8bd0d4ca5629b2f409478525c
Merge branch 'master' of orgmode.org:org-mode