Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sun, 19 Oct 2014 19:19:08 +0000 (12:19 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 19 Oct 2014 19:19:08 +0000 (12:19 -0700)

Trivial merge