]> err.no Git - yubikey-server-c/commitdiff
projects / yubikey-server-c / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aba0d86 ce28aa4)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Tue, 27 Oct 2009 20:38:09 +0000 (21:38 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 27 Oct 2009 20:38:09 +0000 (21:38 +0100)

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