From: Alex Brelsfoard Date: Wed, 28 Jan 2015 19:44:00 +0000 (-0500) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=42e878b29ae26943d7dc3acfbb7f095a56ae0a2f;p=freeside.git Merge branch 'master' of git.freeside.biz:/home/git/freeside --- 42e878b29ae26943d7dc3acfbb7f095a56ae0a2f