Merging. Mercurial is confusing.

--HG-- branch : distribute extra : rebase_source : 59fc16f137ccf3dd94f1fd2aa1dd6008bb93c005

Merging. Mercurial is confusing.
--HG-- branch : distribute extra : rebase_source : 59fc16f137ccf3dd94f1fd2aa1dd6008bb93c005
a5bc17cc · Lennart Regebro · dea50c23 · 269f12ef · a5bc17cc
Commit a5bc17cc authored Sep 23, 2009 by Lennart Regebro
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 103 additions and 104 deletions

distribute_setup.py distribute_setup.py +103 -104

No files found.
--- a/distribute_setup.py
+++ b/distribute_setup.py