Merge branch 'maint'
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 8 Sep 2013 05:33:34 +0000 (8 07:33 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 8 Sep 2013 05:33:34 +0000 (8 07:33 +0200)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge