]> err.no Git - yubikey-server-c/commitdiff
projects / yubikey-server-c / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59de5b7 78ad2d8)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 22 Oct 2009 20:27:14 +0000 (22:27 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 22 Oct 2009 20:27:14 +0000 (22:27 +0200)

Trivial merge
Unnamed repository; edit this file to name it for gitweb.