Merge branch 'master' of git://orgmode.org/org-mode
commit970dba19b17bdaf395c90040604ee61900886647
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 17 Jan 2011 11:51:51 +0000 (17 12:51 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 17 Jan 2011 11:51:51 +0000 (17 12:51 +0100)
tree3f081d04716cd5704dcb76e6e1421c1c099f5315
parenta7ac1f5cc98595d8953205e481e528a9a6871c88
parent821082b5b091142b3f3c1f7388ac30cde0d040ea
Merge branch 'master' of git://orgmode.org/org-mode