From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 1 Jun 2013 09:24:02 +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=049f013e7e6409edcc3997f2496784573be3de3e;p=freeside.git

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

049f013e7e6409edcc3997f2496784573be3de3e