From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 24 Apr 2013 07:00:13 +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=196d15248930f3e54811a8b46b5ede47db678e19

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

196d15248930f3e54811a8b46b5ede47db678e19