From: achbed <github@achbed.org>
Date: Sun, 11 Jan 2015 23:00:39 +0000 (-0600)
Subject: Merge remote-tracking branch 'remotes/upstream/dev' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7b8c68e770fe5af9799f0aeb2fde1d6471355dd9;p=deefuzzer.git

Merge remote-tracking branch 'remotes/upstream/dev' into dev
---

7b8c68e770fe5af9799f0aeb2fde1d6471355dd9