From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 11 Feb 2015 19:56:39 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=81bad22dc70a9277331d2d15ff25810f615c4a92;p=freeside.git

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

81bad22dc70a9277331d2d15ff25810f615c4a92