Merge admin branch.
authorAntony Chazapis <chazapis@gmail.com>
Tue, 4 Oct 2011 07:36:32 +0000 (10:36 +0300)
committerAntony Chazapis <chazapis@gmail.com>
Tue, 4 Oct 2011 07:36:32 +0000 (10:36 +0300)
commitb6b41731d8829d6ffd92bc203cc36d2266e3d3bc
tree9fb74b25c310fca2cacf58c3a1cee0bdd45e3106
parent8c4431d393a9bdb6c2a753cc8340532a5e2cbf9b
Merge admin branch.

Fixes #1237
pithos/settings.py.dist