Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 12:27:56 +0000 (13:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 12:27:56 +0000 (13:27 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge