Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0
authorSapan Bhatia <gwsapan@gmail.com>
Wed, 7 May 2014 14:38:23 +0000 (10:38 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Wed, 7 May 2014 14:38:23 +0000 (10:38 -0400)

Trivial merge