Raphael 6c0b187d40 Merge remote branch 'jwinky/446-user-name-length-limit' ... Conflicts: app/models/user.rb		2010-11-01 11:00:02 -07:00
..
controllers	Merge remote branch 'traction/441-failed-aspect-creation-redirect'	2010-10-31 23:22:10 -07:00
helpers	removed two unused methods	2010-10-31 14:50:14 -07:00
mailers	stubbing out the hub publish method	2010-10-29 12:09:10 -07:00
models	Merge remote branch 'jwinky/446-user-name-length-limit'	2010-11-01 11:00:02 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Merge remote branch 'jdeisenberg/492-vague-signup-wording'	2010-10-31 23:44:50 -07:00