merge latest Amisha changes
authorScott Baker <smbaker@gmail.com>
Fri, 23 May 2014 18:50:54 +0000 (11:50 -0700)
committerScott Baker <smbaker@gmail.com>
Fri, 23 May 2014 18:50:54 +0000 (11:50 -0700)
commit9d9650db4e9559615a11f4e6ccf16de1d92582a5
tree81699d54cda449f636123645b0d326d228e7e560
parentff5e0f3d601b0f930a699cc0992d8e22a05f3ce0
merge latest Amisha changes
planetstack/core/plus/views.py
planetstack/templates/admin/dashboard/tenant.html