From: A. Bellenir <abellenir@users.noreply.github.com>
Date: Sun, 3 Aug 2014 03:32:35 +0000 (+0000)
Subject: Merge pull request #15 from mikedlowis/development
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=HEAD;p=archive%2Fafm.git

Merge pull request #15 from mikedlowis/development

Merge development with master
---

dc9bdadc246d339cce2540ce3ce31c3400243478