From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 4 Dec 2014 18:37:16 +0000 (-0800)
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=8dd41f364aaba88969dfd0908feb22709025e7f6

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

8dd41f364aaba88969dfd0908feb22709025e7f6