Merge branch 'master' of orgmode.org:org-mode
commit4a48a049056a0081068916fec1b9a6146d4981f6
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 9 Dec 2011 22:23:07 +0000 (9 23:23 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 9 Dec 2011 22:23:07 +0000 (9 23:23 +0100)
tree849f9e5068adcad90a53c1d3de6173b8f9fddfdf
parent8b7f27959c967b0be64d6c2176b0644c4e3eecaa
parentda566e9fe20129e8ed2320bc7b355a37f065b923
Merge branch 'master' of orgmode.org:org-mode