Merge branch 'master' of orgmode.org:org-mode
commitc5f2ae7c8d2bb4f533f0a04bfab17b0db139a8f4
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 15 Sep 2013 04:41:25 +0000 (15 06:41 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 15 Sep 2013 04:41:25 +0000 (15 06:41 +0200)
tree824196edc37f04adfafd33e24a84bb40fea0bf38
parentfc2ec2eb886ae469dbc2fe4fcb3bee91cf94a227
parentbbe8518118646a28faaedd08f403036c2e2f9939
Merge branch 'master' of orgmode.org:org-mode