Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Thu, 21 Aug 2014 07:13:18 +0000 (00:13 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 21 Aug 2014 07:13:18 +0000 (00:13 -0700)

Trivial merge