Merge branch 'maint' of orgmode.org:org-mode into maint
commit89147ede728260627cc6093304c3f1a0e3f3c927
authorBastien Guerry <bzg@altern.org>
Sat, 11 Jan 2014 00:35:00 +0000 (11 01:35 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 11 Jan 2014 00:35:00 +0000 (11 01:35 +0100)
tree82a763750e8cbf027802188fe6a43d397286b5d6
parent21472107fa736c8ce557107051578163e0d84ee7
parentde8884f38e774c366d63ebf1ba75575d031cc393
Merge branch 'maint' of orgmode.org:org-mode into maint