From: achbed <github@achbed.org>
Date: Thu, 29 Jan 2015 22:53:37 +0000 (-0600)
Subject: Merge remote-tracking branch 'remotes/upstream/dev' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6080bc5bf312c6c30f6930461faa3e1b6f9c0c22;p=deefuzzer.git

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

6080bc5bf312c6c30f6930461faa3e1b6f9c0c22