From: Ben Beltran <redacted>
Date: Wed, 12 Apr 2017 05:22:31 +0000 (-0500)
Subject: Merge branch 'release/2.0.0'
X-Git-Tag: 2.0.0
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/edee19fbcb97ddd350701a5ac48027ab3b862cf6

Merge branch 'release/2.0.0'
---

f2a4303543b0b0c1a62681c74244176aa778f417