git.zerfleddert.de Git - proxmark3-svn/commit

author	marshmellow42 <marshmellowrf@gmail.com>
	Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)
committer	marshmellow42 <marshmellowrf@gmail.com>
	Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)
commit	ae6ead3dc84acd074be24c0da5efd94ea7a0b225
tree	e55b8afc2aee6267a86237611d787ceccf3a7335	tree \| snapshot
parent	ac3ba7ee694dc67ee4c8bae293111b6c26f551a2	commit \| diff
parent	4e3d8d0f764823d3550970d6d686a86e8f04d8af	commit \| diff

Merge remote-tracking branch 'upstream/master'

Conflicts:
client/cmdlf.c