Merge branch 'master' of orgmode.org:org-mode
commit20ff46e825fac51f6c4b893c1c1941dd71b38e51
authorDavid Maus <dmaus@ictsoc.de>
Sat, 13 Aug 2011 13:02:58 +0000 (13 15:02 +0200)
committerDavid Maus <dmaus@ictsoc.de>
Sat, 13 Aug 2011 13:02:58 +0000 (13 15:02 +0200)
treed390ebfacef6308b4efb9e58178e337e6b044a83
parent3771185caefc6d35c4ff0523bdbae878f3e92203
parent7d2d8f884b2e22e3056553ea68858fe4fc674427
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el