Merge branch 'master' of orgmode.org:org-mode
commit2bd8370d0687b4a8e321fa1fe9102e600367dc5f
authorBastien Guerry <bzg@altern.org>
Fri, 12 Sep 2014 19:40:17 +0000 (12 21:40 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 12 Sep 2014 19:40:17 +0000 (12 21:40 +0200)
treee83fd02ab1bef7393a82944608f8e426848aa371
parentfdd9d878e092162c4c4c7c705f1fe5a0d6757256
parent70a0c5bfa16ce4c9bc538ec57c3eb926eb26ea11
Merge branch 'master' of orgmode.org:org-mode