Merge branch 'master' of orgmode.org:org-mode
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 23 Nov 2011 06:36:23 +0000 (07:36 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 23 Nov 2011 06:36:23 +0000 (07:36 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge