Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0
authorSapan Bhatia <gwsapan@gmail.com>
Mon, 12 May 2014 18:33:56 +0000 (14:33 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Mon, 12 May 2014 18:33:56 +0000 (14:33 -0400)
commitee890b694a34107d61b75ca1e2e37f984d5d419a
tree89d81c5e373f4c92910b62f77d8f9dc9e8725a02
parentefa0c79e2d8e82d8f9accf3263a32367e20ffbcd
parent2290b059d8ddc69cc7d4dfa8418bbad65c896e61
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0

Conflicts:
planetstack/core/fixtures/demo_data.json
planetstack/core/fixtures/initial_data.json
planetstack/core/fixtures/demo_data.json
planetstack/core/fixtures/initial_data.json