From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 16 Jan 2014 06:17:36 +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=649606c0123e1c21b9b054abf63b2933d41df2cc

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

649606c0123e1c21b9b054abf63b2933d41df2cc