From: Ben Beltran <redacted>
Date: Mon, 28 Mar 2016 06:11:04 +0000 (-0600)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: 1.0.0
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/169ee855dda610ea7156fc2269ca483c0a9ae14c

Merge branch 'release/1.0.0'
---

d24eedbc16dff03f940e342bda72b572befcc4a3