Merge branch 'master' of orgmode.org:org-mode
commitbfab7af1627efcf51ed195a34061f838a938c6cb
authorBastien Guerry <bzg@altern.org>
Tue, 2 Sep 2014 14:23:05 +0000 (2 16:23 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Sep 2014 14:23:05 +0000 (2 16:23 +0200)
treeb8c5622d471fbed4816d7adecd7f05e8a9a02de3
parentcdccf1f15bfe4e1ec567b50c40412dc0b37400c9
parentd4e4b1ea68e9dc493fe99a09085008b68d1885cb
Merge branch 'master' of orgmode.org:org-mode