Merge branch 'master' of orgmode.org:org-mode
commita949b23aa6958f83c3408f8d7c009d084dfbb999
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 16 Dec 2014 22:55:56 +0000 (16 23:55 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 16 Dec 2014 22:55:56 +0000 (16 23:55 +0100)
tree2bde2a9aa438cb4358722d283e9199591bcaeb89
parentc1558d34d78842ad022963dee591ab963e50053d
parent57b76e2771d38c1f2ef43035011acba29f4d340f
Merge branch 'master' of orgmode.org:org-mode