From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 19 Jan 2013 19:31:40 +0000 (-0800)
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=4c775d58b5dbb4fae05f303a612c781eaaf3a56f

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

4c775d58b5dbb4fae05f303a612c781eaaf3a56f