Merge branch 'master' of orgmode.org:org-mode
commit984318cea532b61fcf1afb6fc6f3970a0a4de2c0
authorBastien Guerry <bzg@altern.org>
Tue, 23 Aug 2011 15:52:53 +0000 (23 17:52 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 23 Aug 2011 15:52:53 +0000 (23 17:52 +0200)
tree285c868da3cc1803f9491cc5158ca77ffab229f7
parent15798836e2bb84bebfb005375e08e38830fc90ee
parent21fd1523be507417275bf43ef7e1cf5a9429de75
Merge branch 'master' of orgmode.org:org-mode