Merge branch 'issue/SCT-1140' of https://github.com/Jayceh/Freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 17 Jan 2015 02:53:25 +0000 (18:53 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 17 Jan 2015 02:53:25 +0000 (18:53 -0800)

Trivial merge