Merge branch 'master' of orgmode.org:org-mode
commit079ea0bf20a30af6064c9abe4c05775ba9997776
authorBastien Guerry <bzg@altern.org>
Tue, 26 Aug 2014 08:37:36 +0000 (26 10:37 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Aug 2014 08:37:36 +0000 (26 10:37 +0200)
tree67997d385fb59a7f301e1a8fccfb779f3fd7df24
parentc9fdd7f8b16a85308596e0dcee707a473b431187
parent9a34a13c077f592c5528d95c155ecdf2d655937e
Merge branch 'master' of orgmode.org:org-mode