Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Wed, 22 Apr 2015 21:33:50 +0000 (14:33 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 22 Apr 2015 21:33:50 +0000 (14:33 -0700)

Trivial merge