]> err.no Git - pwstore/commit
Merge remote-tracking branch 'tfheen/master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 25 Feb 2014 17:22:01 +0000 (18:22 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 25 Feb 2014 17:22:01 +0000 (18:22 +0100)
commit8dcb0777ce9fffa0a40a8c18fb3b62250685871b
tree95c9e0efd921852b25c538f425ecb89b9cf7d7ad
parent3b73aa1896e8f2570bb6396500848177f8ea895d
parent498c9c9f6c378bc4b41518d82b9c44822c15ded6
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