Merge branch 'maint'
commit409560b7f85446e37553a3fb7559de136b1e2e50
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 16 Nov 2014 14:51:13 +0000 (16 15:51 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 16 Nov 2014 14:51:13 +0000 (16 15:51 +0100)
tree92696a666454e311de38dbc7619fd5b4e53a092e
parentf74cc9c4fb6a958756bc0847819ff1672cae7ac8
parent59111b77efad2583e432a86479ccf8d175077e8e
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el