Merge branch 'master' of orgmode.org:org-mode
commit8abdb06274a2708fbea1d3de735b5dba69b7c740
authorBastien Guerry <bzg@altern.org>
Fri, 10 Jan 2014 20:01:44 +0000 (10 21:01 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 10 Jan 2014 20:01:44 +0000 (10 21:01 +0100)
tree6a40f9aaff29bba9d88d42f65f44e22e1e261414
parent3f8aee0ed09dc6031346c9b1abbe2b003e0cc53b
parentf5380d122146a99bd497b8ae235382c21d0f8e3e
Merge branch 'master' of orgmode.org:org-mode