Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Wed, 6 Aug 2014 18:27:44 +0000 (11:27 -0700)
committerScott Baker <smbaker@gmail.com>
Wed, 6 Aug 2014 18:27:44 +0000 (11:27 -0700)
1  2 
opencloud.spec

diff --cc opencloud.spec
Simple merge