Commit 493855ee authored by Jason R. Coombs's avatar Jason R. Coombs

Merge (discarding b825c6440dc6)

--HG--
branch : distribute
extra : rebase_source : 5190d1f30b60efbc0cc70a96807c1b269abd1897
parents e6a12bbf edaefa49
......@@ -842,4 +842,4 @@ def local_open(url):
# this line is a kludge to keep the trailing blank lines for pje's editor
# this line is a kludge to keep the trailing blank lines for pje's editor
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment