Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0
authorSapan Bhatia <gwsapan@gmail.com>
Mon, 12 May 2014 18:35:05 +0000 (14:35 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Mon, 12 May 2014 18:35:05 +0000 (14:35 -0400)
commit99015928b76751971bb60706dd4ef4b1d26e80ca
tree41acc38f1f6cda4905d1157725fc8fc9f4b76a7b
parentee890b694a34107d61b75ca1e2e37f984d5d419a
parent3949bc60fb66615379964bb20e60f0666fd10a96
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0

Conflicts:
planetstack/observer/syncstep.py
planetstack/core/fixtures/demo_data.json
planetstack/core/fixtures/initial_data.json
planetstack/observer/event_loop.py
planetstack/observer/syncstep.py