Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 16:40:48 +0000 (17:40 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 16:40:48 +0000 (17:40 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge