From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 3 Jun 2014 19:14:49 +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=b86687a90410fb7147c172b0a2f8581fb1b9e64e;hp=-c;p=freeside.git

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

b86687a90410fb7147c172b0a2f8581fb1b9e64e