From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 16 May 2015 23:08:31 +0000 (-0700)
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=1cde870268b03197da75f089669d60a7ba3c5617;p=freeside.git

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

1cde870268b03197da75f089669d60a7ba3c5617