]> err.no Git - yubikey-server-c/commitdiff
projects / yubikey-server-c / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b777d63 e576638)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 26 Oct 2009 21:41:44 +0000 (22:41 +0100)
committerTollef Fog Heen <tfheen@err.no>
Mon, 26 Oct 2009 21:41:44 +0000 (22:41 +0100)

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