Merge remote-tracking branch 'remotes/marko-github/master'
authorTarvi Pillessaar <tarvi.pillessaar@skype.net>
Mon, 31 Dec 2012 08:00:25 +0000 (10:00 +0200)
committerTarvi Pillessaar <tarvi.pillessaar@skype.net>
Mon, 31 Dec 2012 08:00:25 +0000 (10:00 +0200)
1  2 
python/skytools/__init__.py
python/skytools/hashtext.py

Simple merge
Simple merge