From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 12 Jun 2013 20:28:41 +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=b6b3cfc0f5967d9c2c73202ab73cadfce2a63b67

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

b6b3cfc0f5967d9c2c73202ab73cadfce2a63b67