Merge branch 'master' of orgmode.org:org-mode
commite48c3221de727f034c1999e776ad17850e58e750
authorBastien Guerry <bzg@altern.org>
Wed, 29 Jun 2011 09:28:03 +0000 (29 11:28 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 29 Jun 2011 09:28:03 +0000 (29 11:28 +0200)
treec618ab83d80e920fbcf2a1aa159d5768ab31eaf6
parente01e160f318f2a942e20d84fd5f1c1a664ec4f37
parent1357344a769886e344d9fb75de42706b760abe05
Merge branch 'master' of orgmode.org:org-mode