Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sun, 13 Jan 2013 10:18:00 +0000 (11:18 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 13 Jan 2013 10:18:00 +0000 (11:18 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge