Merge branch 'master' of orgmode.org:org-mode
commitcea5ab81ea0a0fe7425880562f8567a7f65c81c8
authorBastien Guerry <bzg@altern.org>
Sun, 20 Apr 2014 10:19:28 +0000 (20 12:19 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 20 Apr 2014 10:19:28 +0000 (20 12:19 +0200)
tree011484d2ac933f5b253d5fd6a9660cb85d31bc9c
parent198140aa68dba341545778021dbc6be5a6ba2f7a
parent55bde39d88084da99634ecb3dc6ac8af3567073c
Merge branch 'master' of orgmode.org:org-mode