Merge branch 'master' of orgmode.org:org-mode
commit4d65272e03a70e20a3ba53624c8e1b240137fd59
authorBastien Guerry <bzg@altern.org>
Tue, 1 May 2012 13:57:27 +0000 (1 15:57 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 1 May 2012 13:57:27 +0000 (1 15:57 +0200)
tree9017c9bed454382d803cba8c8daf4e4fa65eb85d
parent9f3b35a114a61beb53eec3c52b0cd43bc0549504
parent172d7a6f5e2e03a50bf0dc699ca24e5db3e6aa39
Merge branch 'master' of orgmode.org:org-mode