From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 17 Jul 2014 13:45:20 +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=85fbf4faf43f7c8d38973304c2a0940275160a73

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

85fbf4faf43f7c8d38973304c2a0940275160a73