Merge branch 'maint'
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 13 Sep 2013 19:09:49 +0000 (21:09 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 13 Sep 2013 19:09:49 +0000 (21:09 +0200)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge