From: Iceman <iceman@iuse.se>
Date: Mon, 15 Jan 2018 15:06:37 +0000 (+0100)
Subject: Merge pull request #503 from merlokk/travis
X-Git-Tag: v3.1.0~86
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/138a0e7a6b0d043cd3b1736f194213291d42d30d?ds=inline

Merge pull request #503 from merlokk/travis

Travis
---

138a0e7a6b0d043cd3b1736f194213291d42d30d