Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sun, 18 Aug 2013 05:36:45 +0000 (22:36 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 18 Aug 2013 05:36:45 +0000 (22:36 -0700)

Trivial merge