Merge branch 'master' of orgmode.org:org-mode
commit9bd1c338a057e1808eeed08239ac0e76136e05ee
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 9 Oct 2011 11:17:58 +0000 (9 13:17 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 9 Oct 2011 11:17:58 +0000 (9 13:17 +0200)
tree8e5da8cc8775dcef7a9ecd1b7d6efcb3520e15ea
parentf8cd4a3793892d0fd34e0a96b122b96971eb5676
parent6f69fbca0ca1bba1750a6225fe9230985bf68689
Merge branch 'master' of orgmode.org:org-mode