Merge branch 'master' of orgmode.org:org-mode
commit07a2f48209a8a5c162027ce30cae5ab95147532f
authorBastien Guerry <bzg@altern.org>
Mon, 25 Jul 2011 13:45:01 +0000 (25 15:45 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Jul 2011 13:45:01 +0000 (25 15:45 +0200)
tree49a3c499420775ff71838540b23a2881e03e2c8a
parentbbb2ef510ae8fbf28296c8968b99a24408c7c3ce
parentee3ea164c945268213d3e78ce2548943877790fe
Merge branch 'master' of orgmode.org:org-mode