Merge branch 'master' of orgmode.org:org-mode
commit0ec831d2c898a1cf65787efaf212330a1ccf2b17
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 13 Jan 2011 11:53:28 +0000 (13 12:53 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 13 Jan 2011 11:53:28 +0000 (13 12:53 +0100)
treeb10042f96500e9b9142affeef0b9a312fe3eaed5
parente599234d5c0245dfc53037a6dc0128349b197627
parentf7a752f6d60e1c747dc9330c5f12631bf77f6aa3
Merge branch 'master' of orgmode.org:org-mode