From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 11 Jan 2014 00:48:41 +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=0ddb95ef7e09ada82657f30ce459fe229b2851c0

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

0ddb95ef7e09ada82657f30ce459fe229b2851c0