From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 9 Jul 2014 00:44:38 +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=82532f6d81a8592b38f57fbb566e1a7b2177a012

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

82532f6d81a8592b38f57fbb566e1a7b2177a012