From: elijah <elijah@riseup.net>
Date: Thu, 31 Jan 2013 19:17:49 +0000 (-0800)
Subject: Merge branch 'master' of ssh://leap.se/leap_cli
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=56f431cc4776cb49b3db1289ecd6c7deda71eb6f;p=leap%2Fleap_cli.git

Merge branch 'master' of ssh://leap.se/leap_cli

Conflicts:
	lib/leap_cli/commands/deploy.rb
---

56f431cc4776cb49b3db1289ecd6c7deda71eb6f