From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 25 Feb 2015 02:42:54 +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=8142815f404a02df9ba3f92ad8e703a7355c5bcd

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

8142815f404a02df9ba3f92ad8e703a7355c5bcd