err.no Git - yubikey-personalization/commit

]> err.no Git - yubikey-personalization/commit

author	Fredrik Thulin <fredrik@yubico.com>
	Fri, 25 May 2012 12:00:29 +0000 (14:00 +0200)
committer	Fredrik Thulin <fredrik@yubico.com>
	Fri, 25 May 2012 12:00:29 +0000 (14:00 +0200)
commit	15a5ffeaa5767b25f3de463e2143e5290ed8e5ad
tree	993acb4d5aa593ced933397595fbadbc31969133	tree \| snapshot
parent	2157b4ac950052bd3e736aed5cde49b272001a88	commit \| diff
parent	da2dd2d904e7758a7d8dbbf65850540a438e70cc	commit \| diff

Merge branch 'master' into private/testing+ndef

Conflicts:
NEWS
configure.ac