Merge branch 'master' of orgmode.org:org-mode
commit0df11d910c848bf05695584db7df32043b808326
authorBastien Guerry <bzg@altern.org>
Mon, 18 Jul 2011 23:25:47 +0000 (19 01:25 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 18 Jul 2011 23:25:47 +0000 (19 01:25 +0200)
tree83100c8dee524b718738f3a6d9f684a81caf7778
parenta90b876b936820f6a80cc2ffa807bc29a9de73eb
parent8854497c354b10188ad9be408ed7291d299140c1
Merge branch 'master' of orgmode.org:org-mode