From: Ben Beltran <redacted>
Date: Wed, 12 Apr 2017 05:22:57 +0000 (-0500)
Subject: Merge branch 'release/2.0.0' into develop
X-Git-Tag: 3.0.0^2~9
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/b58bb0a6b290c8afe6d219897a547fa087b279d2?hp=100b8422835fc876c8cff2c2960b63e95a01b744

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