From: achbed <github@achbed.org>
Date: Mon, 19 Jan 2015 23:01:17 +0000 (-0600)
Subject: Merge remote-tracking branch 'remotes/upstream/dev' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1c25648279db1eb554600771b6ac51bfdf9830e6;p=deefuzzer.git

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

1c25648279db1eb554600771b6ac51bfdf9830e6