From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 12 Jul 2014 22:51:43 +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=48e85cba67e48bb37b79d9e4fa72cf0df7cd3759

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

48e85cba67e48bb37b79d9e4fa72cf0df7cd3759