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)
commit8e8c3bf05608ee879c19f49405b9d8e8d61e4074
tree45964bf2916acb7dee5facc356a40d07a2f95808
parent5046d68589a5e13b63e5e1b7d2ea6fd6ce669a6f
parent92e7a016c36538e4d292e718685ab5b1c054e03d
Merge branch 'master' of git://github.com/markokr/skytools-dev

Conflicts:

python/pgq/cascade/admin.py