Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Tue, 23 Jul 2013 19:19:25 +0000 (12:19 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 23 Jul 2013 19:19:25 +0000 (12:19 -0700)

Trivial merge