]> err.no Git - yubikey-server-c/commitdiff
projects / yubikey-server-c / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b585049 58ecf48)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sun, 27 Dec 2009 11:12:10 +0000 (12:12 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 27 Dec 2009 11:12:10 +0000 (12:12 +0100)

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