Merge branch 'jhh-dev' of git://git.planet-lab.org/plstackapi into jhh-dev
authorroot <root@node46.princeton.vicci.org>
Mon, 22 Sep 2014 20:40:20 +0000 (20:40 +0000)
committerroot <root@node46.princeton.vicci.org>
Mon, 22 Sep 2014 20:40:20 +0000 (20:40 +0000)
commitc69b908effda79b0a722c88291bd615a727df084
tree01e7ec0367b538c11c5d6f2f40be47a4932bf673
parentce9b5d6bdf62c52cb55b789f2efe7444fa33ece6
parentca20070709966cde44a046eb9f8911d16b5f0c84
Merge branch 'jhh-dev' of git://git.planet-lab.org/plstackapi into jhh-dev