Merge branch 'master' of orgmode.org:org-mode
commit671a01c7657145f5a926127fc474539ea618be4e
authorBastien Guerry <bzg@altern.org>
Tue, 26 Aug 2014 14:23:36 +0000 (26 16:23 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Aug 2014 14:23:36 +0000 (26 16:23 +0200)
treebea1564741b9ee09b0fb35dddb20a7f0d0760669
parent079ea0bf20a30af6064c9abe4c05775ba9997776
parent2593b4d878f04eaf55a8a32d5a6ddd1343116982
Merge branch 'master' of orgmode.org:org-mode