Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 12 Jul 2014 22:30:09 +0000 (15:30 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 12 Jul 2014 22:30:09 +0000 (15:30 -0700)

Trivial merge