From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 29 Jul 2013 09:30:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'tollef/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f33bd82562d889cd77f1487e635d1b1d82d3d90;p=pwstore

Merge remote-tracking branch 'tollef/master'

* tollef/master:
  Use ./.keyring when learning key fingerprints too
  Fix up GROUP_PATTERN support so it allows multiple access items on a line
  Fix up formatting of queries, list keys
---

8f33bd82562d889cd77f1487e635d1b1d82d3d90