Merge branch 'master' of orgmode.org:org-mode
commitfdd9d878e092162c4c4c7c705f1fe5a0d6757256
authorBastien Guerry <bzg@altern.org>
Fri, 12 Sep 2014 17:02:50 +0000 (12 19:02 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 12 Sep 2014 17:02:50 +0000 (12 19:02 +0200)
treedeb3d666928e1c75a6fbdf0e6da40f600383e832
parent8b416bf96b5feee64ff78a24395267ee70c9fa5e
parent4cb0bc089f8c6174746b96a3985afaa61e5d232a
Merge branch 'master' of orgmode.org:org-mode