From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 17 Dec 2013 00:53:23 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=57f4886b44bc370a06550c22b83990ada079eece;p=freeside.git

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

57f4886b44bc370a06550c22b83990ada079eece