Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Nov 2012 23:58:34 +0000 (00:58 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Nov 2012 23:58:34 +0000 (00:58 +0100)
1  2 
lisp/org.el
testing/lisp/test-org.el

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