From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 19 Apr 2013 03:39:27 +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=394ee3d3918436f19ccea49354978057549e0249

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

394ee3d3918436f19ccea49354978057549e0249