Merge branch 'master' of orgmode.org:org-mode
commite17ee8e5778380dc5cb32ccc43486b83f939479d
authorBastien Guerry <bzg@altern.org>
Sun, 14 Sep 2014 09:02:51 +0000 (14 11:02 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 14 Sep 2014 09:02:51 +0000 (14 11:02 +0200)
treece66bed0440a0d96f68006efd44dce87b7f844ca
parente6074ec4d74a18ba2bb017d8fd31bed370880cd1
parent739136e17f815210506e77bdbc81e5475140ced0
Merge branch 'master' of orgmode.org:org-mode