Merge branch 'master' of git://github.com/markokr/skytools-dev
authorMartin Pihlak <martin.pihlak@gmail.com>
Wed, 29 Apr 2009 12:14:02 +0000 (15:14 +0300)
committerMartin Pihlak <martin.pihlak@gmail.com>
Wed, 29 Apr 2009 12:14:02 +0000 (15:14 +0300)
Conflicts:

python/pgq/cascade/admin.py


Trivial merge