From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 29 Aug 2012 22:19:17 +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=33aa032478e29000c8c0d4fbe7bf8cb25c277606

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

33aa032478e29000c8c0d4fbe7bf8cb25c277606