Merge branch 'maint' of orgmode.org:org-mode into maint
commit1aaa934eb25681c5b99856311712cdf8cd52a97b
authorBastien Guerry <bzg@altern.org>
Fri, 28 Jun 2013 07:13:28 +0000 (28 09:13 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Jun 2013 07:13:28 +0000 (28 09:13 +0200)
tree213f4a3a64d00526c7f82fede5ffaba863cde90e
parent39d1323eec8b944d1a19426795bac4bceeac8e0e
parent30581835bdfe172744b51130ccc9075ca2080b32
Merge branch 'maint' of orgmode.org:org-mode into maint