Merge branch 'master' of orgmode.org:org-mode
commite6074ec4d74a18ba2bb017d8fd31bed370880cd1
authorBastien Guerry <bzg@altern.org>
Sat, 13 Sep 2014 13:52:17 +0000 (13 15:52 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 13 Sep 2014 13:52:17 +0000 (13 15:52 +0200)
treee02629c680fe31c53bba0ae22cfed84c16fc9421
parent2bd8370d0687b4a8e321fa1fe9102e600367dc5f
parent9209aa3c9d456bcfdd9d8cd223367f7cfb6b3231
Merge branch 'master' of orgmode.org:org-mode