wvengen 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3 ... Conflicts: app/controllers/login_controller.rb app/models/message.rb app/views/sessions/new.html.haml		2013-04-04 00:29:50 +02:00
..
new.html.haml	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-04 00:29:50 +02:00