Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 23:32:44 +0000 (00:32 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 23:32:44 +0000 (00:32 +0100)
1  2 
lisp/org-exp.el

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