From: Marco Yuen Date: Tue, 12 Jul 2011 16:20:55 +0000 (-0400) Subject: Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d115a860bee5974adc2a9199289dab1bbaaf294e;p=nodemanager.git Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel Conflicts: plugins/euca_iptables.py --- d115a860bee5974adc2a9199289dab1bbaaf294e