Merge branch 'master' of orgmode.org:org-mode
commit2f0491d52eef9fa937db746b2517dde6cfd4e0dc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Apr 2015 22:24:05 +0000 (28 00:24 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Apr 2015 22:24:05 +0000 (28 00:24 +0200)
treed6f8183a7c81d629e2a61678f0dd66b4d463b088
parent21b6b1d9a297f580978dd1b7b9a3468ac2cadc85
parent8e89c0e3b40bb2a140bbbb85def17b1c190eb158
Merge branch 'master' of orgmode.org:org-mode