Merge branch 'master' of orgmode.org:org-mode
commit91e21589778d1c6746e6bb80f1df95ce053724c0
authorBastien Guerry <bzg@altern.org>
Thu, 28 Aug 2014 08:19:41 +0000 (28 10:19 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 28 Aug 2014 08:19:41 +0000 (28 10:19 +0200)
tree551040d745c400c13fff18885a80bed66b485130
parenteb787638e8784e4f4db3e7bc8a997bc66fb7353f
parent5da35ee0cadd7d1f6282a8f4c03eabfcb54e281f
Merge branch 'master' of orgmode.org:org-mode