Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 13 Jun 2015 22:48:48 +0000 (15:48 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 13 Jun 2015 22:48:48 +0000 (15:48 -0700)

Trivial merge