Merge branch 'master' of orgmode.org:org-mode
commit0202adb1c02908a75a7845438381e40d811fd99a
authorEric Schulte <eric.schulte@gmx.com>
Mon, 30 Jul 2012 15:37:08 +0000 (30 09:37 -0600)
committerEric Schulte <eric.schulte@gmx.com>
Mon, 30 Jul 2012 15:37:08 +0000 (30 09:37 -0600)
tree373807da949a19d4a1fbec15922960bec2121661
parent82e269a472d394f0a75268af44bde43490a363e6
parent5cb9beea9b722143ffeaa2c90fd7af075e7d499f
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el