From: David Houghton <houghton@freeside.biz>
Date: Wed, 10 Sep 2014 19:54:31 +0000 (-0400)
Subject: Merge branch 'master' of git+ssh://git.freeside.biz/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=55a9939e17ab945d00336317b9842f17cc27ba6e

Merge branch 'master' of git+ssh://git.freeside.biz/home/git/freeside

Making my local master match the remote.
---

55a9939e17ab945d00336317b9842f17cc27ba6e