fix bad conflict resolution between ivan's and jeff's idea of how to use a different...
[freeside.git] / CREDITS
1 See httemplate/docs/credits.html