Merge branch 'master' of orgmode.org:org-mode
commit27b6b164efa2bbe71865de10e3f198bbf85f5a87
authorBastien Guerry <bzg@altern.org>
Sun, 12 Jan 2014 11:44:49 +0000 (12 12:44 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 12 Jan 2014 11:44:49 +0000 (12 12:44 +0100)
treeec6f2b0b4c5d6ed56885bd785dc512415b337906
parente9e182a7f5d3d91a74c2d5e0b6dd78048d364788
parent9a5b8a74349a9439fd22bbea590127c51539a39f
Merge branch 'master' of orgmode.org:org-mode