Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorIvan Kohler <ivan@freeside.biz>
Sun, 23 Sep 2012 22:05:45 +0000 (15:05 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 23 Sep 2012 22:05:45 +0000 (15:05 -0700)

Trivial merge