Merged origin/master
authormelinath <stephen.r.burrows@gmail.com>
Wed, 16 Jun 2010 15:29:22 +0000 (11:29 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Wed, 16 Jun 2010 15:29:22 +0000 (11:29 -0400)
commitf9377788444b280c32dc7004f0a04b131bb74e14
treeef775498706a40efcdb307579d5cbfd73c409039
parentd628ad546e47a82fe341740e4a3defe546e2f140
parente18b86f47054850e9f49c1cb7aaecd8fdf753e4d
Merged origin/master
admin.py