danielvincent b80d75c382 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-20 15:54:07 -07:00
..
controllers	MS removed a log and trying to be slightly more pedantic	2010-09-20 15:32:18 -07:00
helpers	MS removed a log and trying to be slightly more pedantic	2010-09-20 15:32:18 -07:00
models	DG IZ; escape regex characters in Person.search	2010-09-20 15:25:19 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	DG IZ; click to edit rollover text on aspect manage page	2010-09-20 15:53:56 -07:00