Daniel Vincent Grippi e94b48e19a Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb		2010-09-15 15:55:18 -07:00
..
backer.rb	MS made it two callbacks for handles and keys	2010-09-15 15:45:26 -07:00
dev.rb	added url to backer script	2010-09-15 15:21:52 -07:00
tom.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 15:55:18 -07:00