Merge branch 'master' of orgmode.org:org-mode
commit255f060ad07bc65bd929d2a222175ef096914283
authorBastien Guerry <bzg@altern.org>
Sun, 31 Aug 2014 15:41:45 +0000 (31 17:41 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 31 Aug 2014 15:41:45 +0000 (31 17:41 +0200)
tree82f30a2f71cf2d70c10265b23710e653aa362f63
parentad640ce11524c55a091b83dd55bb2d8021e091a6
parent21258060ad0f46be2d967fda6c6346a7f5723b8c
Merge branch 'master' of orgmode.org:org-mode