Merge branch 'master' of orgmode.org:org-mode
commit6dc26059cbdda56f7fb6df0a4d85e2a86bc70423
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 27 Jan 2015 14:35:56 +0000 (27 15:35 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 27 Jan 2015 14:35:56 +0000 (27 15:35 +0100)
treefdd3c23f232926ab007d83b9490b0f898caa2adb
parent96b02fa9a6edbc1f1feb5eddea332715679f200a
parenta297692b1c4192548643cfd441368a168f69c7c8
Merge branch 'master' of orgmode.org:org-mode