Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorIvan Kohler <ivan@freeside.biz>
Thu, 28 Mar 2013 18:06:04 +0000 (11:06 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 28 Mar 2013 18:06:04 +0000 (11:06 -0700)

Trivial merge