Merge branch 'master' of orgmode.org:org-mode
commit8ea9c35c7c3c9b1d819ca17493c445c96058ed1a
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 22 Feb 2011 13:00:34 +0000 (22 14:00 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 22 Feb 2011 13:00:34 +0000 (22 14:00 +0100)
treed935623cace0c20b3d4bb7caa46a7b125e803c2d
parent4ab9990b54967b081a40d5aff1d73a8a963def7a
parent1ceddf16152cebf43fe9256067b5f63dd3f70a89
Merge branch 'master' of orgmode.org:org-mode