From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 13 Jun 2012 21:34:53 +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=daa09251fec52517b630b3f6935041dc7c795f90

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

daa09251fec52517b630b3f6935041dc7c795f90