From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 16 Sep 2014 03:55:19 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4e7efe58f1a20dfc4fd306fad2c14c8040585be1

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

4e7efe58f1a20dfc4fd306fad2c14c8040585be1