From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 3 May 2014 21:01:34 +0000 (-0700)
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=0576052155894acbda02aac05e136ed030b5707f

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

0576052155894acbda02aac05e136ed030b5707f