From: elijah <elijah@riseup.net>
Date: Sat, 3 Nov 2012 23:01:20 +0000 (-0700)
Subject: Merge branch 'master' of ssh://leap.se/leap_cli
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6c98d65096bb31fa231b6f65de4b1a9b5a7d90ef;p=leap%2Fleap_cli.git

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

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

6c98d65096bb31fa231b6f65de4b1a9b5a7d90ef