Merge branch 'maint'
commitaef1b177737238d9df6991d28dc5ff36934de72d
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 28 Jul 2013 08:17:17 +0000 (28 10:17 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 28 Jul 2013 08:17:17 +0000 (28 10:17 +0200)
treeaa5f4c2c323e21319227b4a9754eed925634ba6c
parent0cef5b63eb67b9665221df77929fe154e0343253
parent36161345d1e1a4e9ff26f6c7da11ffb19a854c44
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el