Merge branch 'agent'
authorYingjie Xu <yxu@nexedi.com>
Thu, 19 Apr 2012 13:52:38 +0000 (15:52 +0200)
committerYingjie Xu <yxu@nexedi.com>
Thu, 19 Apr 2012 13:52:38 +0000 (15:52 +0200)
commitbf60c668c0e8e9e2111db9d21352d7c18e512aa0
treec57531ec061526e948f1a833cf6a5859e96c1355
parentc544f9e478d1ec5f35348da99424fe554689ee1b
parent99a3f9504b46cbd3e54a7fb79f09935a2899249c
Merge branch 'agent'