From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 Apr 2012 22:41:26 +0000 (-0700)
Subject: Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=685f35c0d8d08ea7bbf2ac7cf2db19cdc79fcccf;p=freeside.git

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

685f35c0d8d08ea7bbf2ac7cf2db19cdc79fcccf