Merge branch 'master' of orgmode.org:org-mode
commitd3432917ed8f95af0ce76127e632052fc7430439
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 22 Feb 2011 20:44:46 +0000 (22 21:44 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 22 Feb 2011 20:44:46 +0000 (22 21:44 +0100)
tree40d3a95ff56e68a327de685c2a9bfbd454597ee9
parent82ac473f43994d5e6c4e596d4548bad66c88a5cc
parent648934609336a8919009599260a8b2d94f2b4d64
Merge branch 'master' of orgmode.org:org-mode