From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 26 Jul 2014 20:52:28 +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=0ce1f788031c5eaac0c620add539730dd87e3113

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

0ce1f788031c5eaac0c620add539730dd87e3113