]> err.no Git - pwstore/commitdiff
projects / pwstore / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1779d69 f8d1f39)
Merge remote branch 'tollef/master'
authorPeter Palfrader <peter@palfrader.org>
Mon, 4 Jun 2012 20:45:49 +0000 (22:45 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 4 Jun 2012 20:45:49 +0000 (22:45 +0200)
* tollef/master:
  Allow comments at start of file, before access line
  Add support for pws get file ypath
  Allow : in user ids


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.