Merge branch 'master' of git://git.planet-lab.org/plstackapi
authorjcnelson <jcnelson@cs.princeton.edu>
Fri, 11 Jul 2014 20:27:14 +0000 (16:27 -0400)
committerjcnelson <jcnelson@cs.princeton.edu>
Fri, 11 Jul 2014 20:27:14 +0000 (16:27 -0400)
commit557b6937a312d10055c8cc40285c195a320ceee3
tree8471ff6b9e75bd6c7353ed544b1be8e71bc69e3b
parent575a1353cfb6fd98960278e2146ad6d1c4e49be4
parent86baef6cf008ee02a44e9609e7cd22ff52d3ec15
Merge branch 'master' of git://git.planet-lab.org/plstackapi
planetstack/core/dashboard/views/view_common.py