From: Michael D. Lowis <mike@mdlowis.com>
Date: Mon, 25 May 2015 14:05:26 +0000 (-0400)
Subject: Merge branch 'development' into map
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=7d2aa5f38f09c8499195a574294581298900c01d;p=projs%2Flibcds.git

Merge branch 'development' into map
---

7d2aa5f38f09c8499195a574294581298900c01d