Merge branch 'master' of orgmode.org:org-mode
commit16e21ae1f7cb379eab87cc7c8c674d89633ae9a3
authorBastien Guerry <bzg@altern.org>
Sun, 27 Jul 2014 08:53:24 +0000 (27 10:53 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 27 Jul 2014 08:53:24 +0000 (27 10:53 +0200)
tree71be16f45366e59910adead0d884628d11daff6a
parent092213b507cd5619c839df372ae93fbe3c7b57ab
parent30db07e427a43ce325e50b60c0a57f861475c16d
Merge branch 'master' of orgmode.org:org-mode