From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 21 Feb 2013 22:18:38 +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=15bbf95b1799b5429d486a6882a365bbf20eead8

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

15bbf95b1799b5429d486a6882a365bbf20eead8