]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 9 Dec 2011 21:57:08 +0000 (22:57 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 9 Dec 2011 21:57:08 +0000 (22:57 +0100)
commitdc678b2e01706ff6f69f1f59a1fd5f49df32fe16
tree9f7054d28287de583f73c5a4f31e97b6c2a40100
parent5427c71824def6f1b9a243eca4fdbe3a27afa0e3
parent65dc0840a8b437efd0146ff2f66fb72a13956d02
Merge branch 'master' into debian