merged cont.
authorStefan Schubert <schubi@suse.de>
Fri, 1 Jul 2011 10:36:54 +0000 (12:36 +0200)
committerStefan Schubert <schubi@suse.de>
Fri, 1 Jul 2011 10:36:54 +0000 (12:36 +0200)
commit37ed13de72faee218bd57579bc5962f76e75b1bc
tree355ad7b8d996abfc2605b5e882361c72dbefca65
parenta5c3bd7bdb4fd01108cb23806b56018605e0aed9
merged cont.
webservice/app/controllers/application_controller.rb
webservice/app/controllers/controlpanel_controller.rb
webservice/app/controllers/sessions_controller.rb
webservice/lib/authenticated_system.rb