]> err.no Git - yubikey-server-c/commitdiff
projects / yubikey-server-c / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1d2167 6fc45a5)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 27 Jan 2010 21:12:03 +0000 (22:12 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 27 Jan 2010 21:12:03 +0000 (22:12 +0100)

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