Merge branch 'maint' of orgmode.org:org-mode into maint
commit2aeb5f0cad84e1d2f481d30691e36c6bb1514d64
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 13:48:51 +0000 (4 14:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 13:48:51 +0000 (4 14:48 +0100)
tree998fb28575227471474d7512ee2cd3ff69a43663
parent597a7e65f0fd4fbfb2f755101db7e52f359fe81b
parent9b0067e16600eca0d653db2d1c7b4b57bfd5ef74
Merge branch 'maint' of orgmode.org:org-mode into maint