Merge branch 'master' into agent
authorYingjie Xu <yxu@nexedi.com>
Mon, 23 Apr 2012 19:40:43 +0000 (21:40 +0200)
committerYingjie Xu <yxu@nexedi.com>
Mon, 23 Apr 2012 19:40:43 +0000 (21:40 +0200)
commitbb31b5400ca9b29558760a43ae79df430da02760
treeeb078bde9156cc6d5c5005e977ef6e79b2c4487d
parent7764e58a6a577a69f749fd540d6879518e3854b3
parentfff8452df90555f9d59deab52f883bb8a4a03876
Merge branch 'master' into agent
slapos/recipe/agent/__init__.py