Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 10 Jul 2013 12:14:18 +0000 (10 14:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 10 Jul 2013 12:14:18 +0000 (10 14:14 +0200)
1  2 
lisp/org.el
testing/lisp/test-org.el

diff --cc lisp/org.el
Simple merge
Simple merge