From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 30 Jan 2015 23:24:15 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c90766c7a79260ee047e16699b4791377525f8d0;p=deefuzzer.git

Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev

Conflicts:
	README.rst
---

c90766c7a79260ee047e16699b4791377525f8d0