From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 13 Nov 2014 22:28:36 +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=52a824f9b11ca266be10c76894eaf6607344c8d0

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

52a824f9b11ca266be10c76894eaf6607344c8d0