Merge branch 'master' of orgmode.org:org-mode
commitc49a0f9e40110226546dd242fde531aa46ec57c3
authorBastien Guerry <bzg@altern.org>
Fri, 25 May 2012 22:15:23 +0000 (26 00:15 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 25 May 2012 22:15:23 +0000 (26 00:15 +0200)
treeb5f4434fa2451a63809d9ff52ceb6d43bca7971f
parent8c91f690a561113eee0d16cdb6e8afc6bcae2089
parent8ee5ce1d2b7be1e8ee0692ea005599a76f8729d3
Merge branch 'master' of orgmode.org:org-mode