]> gitweb.fluxo.info Git - leap/leap_cli.git/commit
Merge branch 'master' of ssh://leap.se/leap_cli
authorelijah <elijah@riseup.net>
Thu, 31 Jan 2013 19:17:49 +0000 (11:17 -0800)
committerelijah <elijah@riseup.net>
Thu, 31 Jan 2013 19:17:49 +0000 (11:17 -0800)
commit56f431cc4776cb49b3db1289ecd6c7deda71eb6f
treea9041d673e0535510052ebbbf065da174606af72
parent0d5a30572789e33422a1ef2b477ed825b9b85d44
parent4c76fd7e1dc8b2a2489d2f99ffa6e305477177ad
Merge branch 'master' of ssh://leap.se/leap_cli

Conflicts:
lib/leap_cli/commands/deploy.rb