Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Thu, 6 Feb 2014 17:34:37 +0000 (09:34 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 6 Feb 2014 17:34:37 +0000 (09:34 -0800)

Trivial merge