From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 6 Mar 2015 01:30:46 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=f34ac99a5e160d2eac4fb2cfecce820d1cf9b7ed

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

f34ac99a5e160d2eac4fb2cfecce820d1cf9b7ed