Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Tue, 21 Jul 2015 16:50:48 +0000 (09:50 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 21 Jul 2015 16:50:48 +0000 (09:50 -0700)

Trivial merge