Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 12:08:44 +0000 (3 13:08 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 12:08:44 +0000 (3 13:08 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge