From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 6 Nov 2014 19:43:52 +0000 (-0800)
Subject: Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib
X-Git-Url: https://git.donarmstrong.com/?p=lib.git;a=commitdiff_plain;h=18edd93e98d2ba86f261b1100b0eaa00be53532b

Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib
---

18edd93e98d2ba86f261b1100b0eaa00be53532b