Merge branch 'master' of orgmode.org:org-mode
commit1b014d1cb2b84f946a7da7c3abf51a46187f8846
authorEric Schulte <schulte.eric@gmail.com>
Sun, 20 Nov 2011 16:40:52 +0000 (20 09:40 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Sun, 20 Nov 2011 16:40:52 +0000 (20 09:40 -0700)
tree615f75143e93245bd3e11d6ad24f2b25edb8a423
parent82c0f9bf69966f9d5737baa98f068725c82af2c4
parentb5935f777ed6a223e60add48052edf1e6c0c6953
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el