Merge branch 'maint' of orgmode.org:org-mode into maint
commit848240c1cfad186421a4be1e07816e1617371e3b
authorBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:30:48 +0000 (5 14:30 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:30:48 +0000 (5 14:30 +0200)
tree096324740ab94491a66a594789b047e72a3d3621
parentce08e04629cc7c85921e8a30bfbc867b3d906754
parent7e1799e5fc7ba6f050b40c228e7957090426bb96
Merge branch 'maint' of orgmode.org:org-mode into maint