Merge branch 'master' of orgmode.org:org-mode
commitf1449387351edb018f325fda320923db34d74f51
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 3 Sep 2013 14:11:05 +0000 (3 16:11 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 3 Sep 2013 14:11:05 +0000 (3 16:11 +0200)
tree3b09ed799eeaa12a8a92b9c9877750691081171b
parent7fdb56a861908fa7fecc34b4f0a601bfff72767d
parent1ad8f4a01eea87a400f064bc257f0fb3cf1056e0
Merge branch 'master' of orgmode.org:org-mode