From: marshmellow42 <marshmellowrf@gmail.com>
Date: Wed, 7 Oct 2015 13:38:07 +0000 (-0400)
Subject: fix changelog conflict
X-Git-Tag: v2.3.0~22^2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f1f1aceabab9e21e98a415c0db57b09931cc9c84?hp=f1f1aceabab9e21e98a415c0db57b09931cc9c84

fix changelog conflict
---