Raphael f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/controllers/users_controller.rb app/models/user.rb config/sprinkle/provision.rb		2010-08-19 16:09:08 -07:00
..
backer.rb	look at the right yaml key	2010-08-13 12:47:19 -07:00
dev.rb	Copy tom seed to dev seed	2010-08-18 14:32:33 -07:00
tom.rb	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-19 16:09:08 -07:00