Merge branch 'master' of orgmode.org:org-mode
commit0ba1b1ad6d3e5cc9998d9141e453567b0d70ce76
authorBastien Guerry <bzg@altern.org>
Fri, 5 Sep 2014 01:06:12 +0000 (5 03:06 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Sep 2014 01:06:12 +0000 (5 03:06 +0200)
treec8f93009c5691fe5ea5e4df006930fc637277d9a
parentffa0b1b1b4ecb6304b86da18b352768939650a4d
parent1f3c6c2f49a3c6e38c246e6d639da2c11cb6ce6c
Merge branch 'master' of orgmode.org:org-mode