From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 21 Aug 2014 07:13:18 +0000 (-0700)
Subject: Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a00d9ef2ade022e800d22055b8e4c8d2d00223c9

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

a00d9ef2ade022e800d22055b8e4c8d2d00223c9