Merge branch 'master' of orgmode.org:org-mode
commita44cd724c3342aa6e32bf584ffd2864ad5988d7c
authorBastien Guerry <bzg@altern.org>
Tue, 29 Apr 2014 11:08:33 +0000 (29 13:08 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 29 Apr 2014 11:08:33 +0000 (29 13:08 +0200)
tree422e61965b02e52ae7a8fdb0ca4701882f382dae
parent20b70a1716cf4b83a0e521ce784fbf75e601ab3a
parentec0eab7fc97fa3902de2308dfb01818bdd7db589
Merge branch 'master' of orgmode.org:org-mode