]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa49ada 52153f1)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 26 Aug 2011 06:10:16 +0000 (08:10 +0200)
committerTollef Fog Heen <tfheen@err.no>
Fri, 26 Aug 2011 06:10:16 +0000 (08:10 +0200)
Conflicts:
Makefile.am
configure.ac


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