]> err.no Git - pwstore/commitdiff
projects / pwstore / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b33d36 856d549)
Merge remote branch 'tollef/master'
authorPeter Palfrader <peter@palfrader.org>
Sun, 17 Jun 2012 20:56:32 +0000 (22:56 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 17 Jun 2012 20:56:32 +0000 (22:56 +0200)
* tollef/master:
  Drop ypath, since there is no 1.9 implementation, implement the bits we need ourselves
  Allow "@group" in access lines too


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