Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorIvan Kohler <ivan@freeside.biz>
Sat, 1 Jun 2013 09:24:02 +0000 (02:24 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 1 Jun 2013 09:24:02 +0000 (02:24 -0700)

Trivial merge