From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 25 Feb 2014 17:22:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'tfheen/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dcb0777ce9fffa0a40a8c18fb3b62250685871b;p=pwstore

Merge remote-tracking branch 'tfheen/master'

* tfheen/master:
  Whitespace
  Add Fastly copyright
  Raise error instead of calling exit unconditionally
  Make it possible to override what .users file to use
  Allow passing extra args to gpg
  Allow alternative trusted_users files
  Only run parse_command if run directly
  Move pws to pws.rb and add symlink back
---

8dcb0777ce9fffa0a40a8c18fb3b62250685871b