From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 7 Mar 2015 00:21:24 +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=95b6042f37f00de9dca4b5654522fc4098a82d04

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

95b6042f37f00de9dca4b5654522fc4098a82d04