From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 9 Dec 2013 23:04:15 +0000 (-0800)
Subject: Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=ede040e300689a97188db22e09aab932c07517e1

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

ede040e300689a97188db22e09aab932c07517e1