Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Tue, 29 Sep 2015 18:45:55 +0000 (11:45 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 29 Sep 2015 18:45:55 +0000 (11:45 -0700)

Trivial merge