From: Ben Beltran <redacted>
Date: Mon, 28 Mar 2016 06:11:19 +0000 (-0600)
Subject: Merge branch 'release/1.0.0' into develop
X-Git-Tag: 2.0.0~1^2
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/d071276e2426c4180e44debe8b92ad16cbbc414f

Merge branch 'release/1.0.0' into develop
---

d071276e2426c4180e44debe8b92ad16cbbc414f