Merge branch 'master' of ssh://iportnov.ru/home/git/qwerty

Author portnov <portnov@bk.ru>
Author date 2008-11-05 19:16:48
Author local date 2008-11-06 00:16:48 +0500
Committer portnov <portnov@bk.ru>
Committer date 2008-11-05 19:16:48
Committer local date 2008-11-06 00:16:48 +0500
Commit 6953e8780011eff524506932dc5b8c026dd9cb56
Tree de3cb1666a951a194c84d139b9221415e7933483
Parent 359851586606aa984bfa4ce7759d1315c278d6fa
Parent 0d66c45ded7cf2b4f0fe7464c98cca87ee440507
Merge branch 'master' of ssh://iportnov.ru/home/git/qwerty

Conflicts:

	qwerty.py
Affected files:
qwerty.py
ViewGit