From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 5 Jan 2013 22:49:44 +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=7a618d4493ab7a87f6eabfd1ce3630a6b3436c2f

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

7a618d4493ab7a87f6eabfd1ce3630a6b3436c2f