Merge branch 'master' of orgmode.org:org-mode
commit6e1a39bd6efe8bf87d87ac42c8b86633d812791b
authorBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 16:34:14 +0000 (15 18:34 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 15 Apr 2013 16:34:14 +0000 (15 18:34 +0200)
tree2a5173bddd545917e63940eb07f79db1942c601c
parent5e3964d5b4fd7cf764a60662226e7880799acdb2
parent4c812675d0e33c4ba92d0005d7aa47dfe597784b
Merge branch 'master' of orgmode.org:org-mode