From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 11 May 2013 20:18:52 +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=7e586cc9b014c9772043e39ae001e5bf6f841d35

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

7e586cc9b014c9772043e39ae001e5bf6f841d35