From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 15 May 2014 21:59:21 +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=a17d255a7678d360c3673a461b091608b181716c;hp=-c

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

a17d255a7678d360c3673a461b091608b181716c