From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 2 Jul 2012 22:16:52 +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=508c7c268254ef63f26bb8a59aa679a6e24f5019

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

508c7c268254ef63f26bb8a59aa679a6e24f5019