Merge branch 'master' of orgmode.org:org-mode
commitc889f209fbd223695029ee65ed612716630a6570
authorBastien Guerry <bzg@altern.org>
Thu, 8 Mar 2012 08:50:34 +0000 (8 09:50 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 8 Mar 2012 08:50:34 +0000 (8 09:50 +0100)
tree745f12ea274ef41cfde005bed0e6cf778fc98c31
parentf9d864435d1a46c560c73a19efac2443dc066bb8
parent94fe07a5f5a6260d930ad664b981d09c9750dfd9
Merge branch 'master' of orgmode.org:org-mode