Merge branch 'master' of orgmode.org:org-mode
commit14b556772be6245e427cc2f5317680dfeb7b4c74
authorDavid Maus <dmaus@ictsoc.de>
Wed, 10 Aug 2011 16:18:06 +0000 (10 18:18 +0200)
committerDavid Maus <dmaus@ictsoc.de>
Wed, 10 Aug 2011 16:18:06 +0000 (10 18:18 +0200)
tree6de6e29a0a70f2834eba17b28443471bb88f55f9
parentfc572f5a6bb3547c59fdad6ff7497ef2ecb49900
parentb5b4134d0c5e3014d8717d860a5570ebc5256681
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el