Merge branch 'master' of orgmode.org:org-mode
commitcad24004435436f9919e4fb3372140901d7f0ef5
authorBastien Guerry <bzg@altern.org>
Sun, 24 Aug 2014 07:44:02 +0000 (24 09:44 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 24 Aug 2014 07:44:02 +0000 (24 09:44 +0200)
tree1dd70ce00b60dfc001af7cfd2f270b3bcb512570
parent1840df2219938ae4b8efd2fcca32e7aa5a93da13
parent088739b64936f792c30de4984a440490de5cfc44
Merge branch 'master' of orgmode.org:org-mode