From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 2 Nov 2013 19:25:33 +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=3dc2e7f2c7d562b968ae8032e2865eebb401f895

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

3dc2e7f2c7d562b968ae8032e2865eebb401f895