Merge branch 'master' of orgmode.org:org-mode
commit45555db2bdb15333bc69d89db78c2372b5f1699f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 May 2015 17:20:11 +0000 (15 19:20 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 May 2015 17:20:11 +0000 (15 19:20 +0200)
tree57aff5962a548395d2d95f47b6d929747e6f9aac
parent09fface1a9207fb855bb032ed759f3ecc42ff274
parent00dc3b1b727b7c51c6be513146543d783a87199c
Merge branch 'master' of orgmode.org:org-mode