From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 17 Apr 2013 16:48:09 +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=06f92269d9fe378cfa2f00c958404a6e8df642ff

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

Conflicts:
	httemplate/view/cust_main/packages/contact.html
---

06f92269d9fe378cfa2f00c958404a6e8df642ff