]> err.no Git - yubikey-personalization.old/commit
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)
commit4ce5148a1097ee986b7347e9e140017672d8bf06
tree8d2284e65ac71a4584d61ff578e9144b2305c68e
parentfa49adaa9322dd46a5f8e6a839342fbf480b0a00
parent52153f17f545f04dfe2d64a85daf53d082109fd3
Merge branch 'master' into debian

Conflicts:
Makefile.am
configure.ac