Merge branch 'master' of orgmode.org:org-mode
commit60fad005a31bd4364fd66c878ed7481dc6f08efa
authorBastien Guerry <bzg@altern.org>
Wed, 15 Jan 2014 08:23:06 +0000 (15 09:23 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 15 Jan 2014 08:23:06 +0000 (15 09:23 +0100)
tree347357ac22d99e77a417d218c5866a1f30e5c7fa
parent8898c380ab97b31e812cf9cfb8dfc8efd3f0543a
parentda6e2289cc48a0e13a2bb775d737fa1dbd103b73
Merge branch 'master' of orgmode.org:org-mode