Merge branch 'master' of git+ssh://git.freeside.biz/home/git/freeside
authorDavid Houghton <houghton@freeside.biz>
Wed, 10 Sep 2014 19:54:31 +0000 (15:54 -0400)
committerDavid Houghton <houghton@freeside.biz>
Wed, 10 Sep 2014 19:54:31 +0000 (15:54 -0400)
commit55a9939e17ab945d00336317b9842f17cc27ba6e
tree4fd48c9f05bd91cf9a5c5a0ae2c743dfd6f7fc2c
parent15b214cb34630925ff42e4252b74403fff77e7c0
parent67622d2fde244b52fdca6a4ba4b98e2453f7986a
Merge branch 'master' of git+ssh://git.freeside.biz/home/git/freeside

Making my local master match the remote.