Merge branch 'rewrite'

Author portnov <portnov@bk.ru>
Author date 2008-06-12 09:59:14
Author local date 2008-06-12 15:59:14 +0600
Committer portnov <portnov@bk.ru>
Committer date 2008-06-12 09:59:14
Committer local date 2008-06-12 15:59:14 +0600
Commit 2c76c54049ddec711a9c171135b4f5167837847f
Tree 3347a84a858dc08e15016d187226e7232c12e9a4
Parent 3544bb75545128475750e598f94705727292dda0
Parent 3fcf1456df439fb4c7699e9773212605606d69f7
Merge branch 'rewrite'

Conflicts:

	modules.py
Affected files:
ViewGit