From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 17 Aug 2014 22:38:22 +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=a618055d3a8cfc55a449847b433dcdc85df92bcd

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

a618055d3a8cfc55a449847b433dcdc85df92bcd