Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi origin/observer3.0
authorSapan Bhatia <gwsapan@gmail.com>
Wed, 30 Apr 2014 05:15:48 +0000 (01:15 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Wed, 30 Apr 2014 05:15:48 +0000 (01:15 -0400)
commitd3cfe42ee1adbe8163e17f08915e5c619ef198f0
treed80fcbc587cc5b4b5190e6bd36b8c232ba10b2ec
parent67eddf13cfecc0e18151ec00d077c8e1dd01a366
parent29bf5e8edb855d32e671e4ebcaf15eecc40258d0
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

Conflicts:
planetstack/observer/event_loop.py
planetstack/observer/event_loop.py