Merge branch 'master' of orgmode.org:org-mode
commitd203b61a117fa3ef5f387a5c2b090bcedf2bacc0
authorBastien Guerry <bzg@altern.org>
Wed, 24 Aug 2011 20:32:55 +0000 (24 22:32 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Aug 2011 20:32:55 +0000 (24 22:32 +0200)
treeda789a0cbf2dc6738d687908b4ed193780ab3d85
parentccc99317dedfab3958b60f08173b0259083aa3d8
parentecc6e2fe3feb46cfa583156404f6d8f34a5ae937
Merge branch 'master' of orgmode.org:org-mode