From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 7 Nov 2014 00:49:30 +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=ce200f25b9d4eebeddac0e8a9a58dbab6a54645b

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

ce200f25b9d4eebeddac0e8a9a58dbab6a54645b