Merge branch '20150325-cust_main-CurrentUser' of https://github.com/fozzmoo/Freeside...
authorIvan Kohler <ivan@freeside.biz>
Fri, 3 Apr 2015 18:24:16 +0000 (11:24 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 3 Apr 2015 18:24:16 +0000 (11:24 -0700)

Trivial merge