merge Amisha's changes
authorScott Baker <smbaker@gmail.com>
Fri, 18 Apr 2014 18:25:32 +0000 (11:25 -0700)
committerScott Baker <smbaker@gmail.com>
Fri, 18 Apr 2014 18:25:32 +0000 (11:25 -0700)
commitb85c26b94d85233f7f658bdc5916de40227a5c4c
tree112be3001e91f72be8e8879a79509b2581f316c9
parent70c18b708e1846ef996c70379b00fb8b008d1758
merge Amisha's changes
planetstack/core/plus/views.py