Merge branch 'master' of orgmode.org:org-mode
commitd1897eed7aa8cc278e2208d39aa15daac6ae4c96
authorBastien Guerry <bzg@altern.org>
Wed, 22 Jan 2014 16:11:43 +0000 (22 17:11 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 22 Jan 2014 16:11:43 +0000 (22 17:11 +0100)
tree79c053c4ec2e463d4d3468985585405faed29890
parent46ad4b561e191d097220c8e24d98ceb9c44caa8f
parent97b0ae8b1f46d339d410c92f2ac6e4db38f2ab44
Merge branch 'master' of orgmode.org:org-mode