Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Wed, 26 Aug 2015 17:46:56 +0000 (10:46 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 26 Aug 2015 17:46:56 +0000 (10:46 -0700)

Trivial merge