Merge branch 'master' of orgmode.org:org-mode
commit02ee22345d4c8fdb3baf41c691c1e3b56746bb30
authorBastien Guerry <bzg@altern.org>
Tue, 1 Mar 2011 08:20:20 +0000 (1 09:20 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 1 Mar 2011 08:20:20 +0000 (1 09:20 +0100)
tree5a9fac2af75863f772a883aa04683d7208c5702d
parent0135cb9c33c89593ced16cf4a5c5daf155b087c9
parentc895af44d4e2ff9408ac54dafaa58e8d057efff5
Merge branch 'master' of orgmode.org:org-mode