From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 31 May 2013 19:59:40 +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=21f645c3a9b932873f3a5eaddebe4171cd76ba9e

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

21f645c3a9b932873f3a5eaddebe4171cd76ba9e