Merge branch 'master' of orgmode.org:org-mode
commit3d4e8b4c00351616134e644e63bab97b4d26a747
authorBastien Guerry <bzg@altern.org>
Sun, 22 Dec 2013 22:37:43 +0000 (22 23:37 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 22 Dec 2013 22:37:43 +0000 (22 23:37 +0100)
treed25532b199a589e9405b9cf903a341c26728811c
parent66f55af525e8c8b477fe595f666565efe8807968
parent5587b8dd511c2f9b56e364ebebeee599e6fedf9e
Merge branch 'master' of orgmode.org:org-mode