Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorIvan Kohler <ivan@freeside.biz>
Wed, 7 Aug 2013 19:07:43 +0000 (12:07 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 7 Aug 2013 19:07:43 +0000 (12:07 -0700)

Trivial merge