From: Ben Beltran <redacted>
Date: Mon, 28 Mar 2016 06:12:03 +0000 (-0600)
Subject: Merge branch 'develop'
X-Git-Tag: 2.0.0~1
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/d063bd00f11577e700c848d220ac6505921632ab?hp=d24eedbc16dff03f940e342bda72b572befcc4a3

Merge branch 'develop'
---