Merge branch 'master' of orgmode.org:org-mode
commit27533656d7aa9eccea0ca19dc2b822dd29568e17
authorBastien Guerry <bzg@altern.org>
Thu, 28 Aug 2014 16:39:50 +0000 (28 18:39 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 28 Aug 2014 16:39:50 +0000 (28 18:39 +0200)
tree4ff16f3b00c168f2dd4bfc85ec7db308bbd9e5fb
parent91e21589778d1c6746e6bb80f1df95ce053724c0
parentccf52269aa670ef6f46012bafdec90aee953282b
Merge branch 'master' of orgmode.org:org-mode