Merge branch 'master' of github.com:Proxmark/proxmark3

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c016c3d0c3c3f2bfbb632cda7bde7d786a50dda..5a6ac6207e59dfab06aa66fa14c70988badabfdd 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [Unreleased][unreleased]
+
+
+
+## [2.1.0][2015-06-23]
+
 ### Changed
 - Added ultralight/ntag tag type detection to `hf 14a read` (marshmellow)
 - Improved ultralight dump command to auto detect tag type, take authentication, and dump full memory (or subset specified) of known tag types (iceman1001 / marshmellow)
@@ -14,6 +19,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 ### Fixed
 - Fixed EM4x50 read/demod of the tags broadcasted memory blocks. 'lf em4x em4x50read' (not page read) (marshmellow)
 - Fixed issue #19, problems with LF T55xx commands (iceman1001, marshmellow)
+- Fixed various problems with iso14443b, issue #103 (piwi, marshmellow)
 
 ### Added
 - Added `hf search` - currently tests for 14443a tags, iclass tags, and 15693 tags (marshmellow)