From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 23 Dec 2014 20:19:30 +0000 (-0800)
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=2fc2924eeebcd3951cbf862da44729187f35ca8d

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

2fc2924eeebcd3951cbf862da44729187f35ca8d