Merge branch 'master' of orgmode.org:org-mode
commit0a0fb300f3bfc6b8863e55faf636e4e82a464a06
authorBastien Guerry <bzg@altern.org>
Fri, 8 Jul 2011 07:59:28 +0000 (8 09:59 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 8 Jul 2011 07:59:28 +0000 (8 09:59 +0200)
tree6c79077aba716cd55592bc63372e17f03ce94285
parentdc59011473063715619d59c915de2ebae8325005
parent197d23cc6fa8a7a70844556d4697bb2ae7d5c6eb
Merge branch 'master' of orgmode.org:org-mode