From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 8 Jul 2013 21:09:40 +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=59c29eed0653360378f9c5428c1c3c5833c3b387

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

59c29eed0653360378f9c5428c1c3c5833c3b387