From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 2 Jun 2014 22:56:11 +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=ba46a6a90321490da78c764657ae19d5c6fd81f8

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

ba46a6a90321490da78c764657ae19d5c6fd81f8