Merge branch 'master' of orgmode.org:org-mode
commit62f9c04e5a0ac50eac520250e59c0115b1d98ec8
authorBastien Guerry <bzg@altern.org>
Fri, 12 Apr 2013 15:52:32 +0000 (12 17:52 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 12 Apr 2013 15:52:32 +0000 (12 17:52 +0200)
treebbd8a2eb6e1a672305542b84e83b927590d6d323
parent9a1511de6bb73097750b35386cdde5e18ffc07a2
parent8b53ae62a5365684ed7d9b82725d2bbff542351b
Merge branch 'master' of orgmode.org:org-mode