Merge branch 'caching'
authorVladislav Gorobets <vgorobets@suse.de>
Mon, 11 Apr 2011 11:24:21 +0000 (13:24 +0200)
committerVladislav Gorobets <vgorobets@suse.de>
Mon, 11 Apr 2011 11:24:21 +0000 (13:24 +0200)
commit1b1ccc3467eb0c0cb7d5f68524eb577f06bbdfa4
tree762d9709d17b5705ab731e92b399e1900d631101
parentb7ac4f262160ea7c5cc75198fe931d0a415db57f
parent6e1f989e322e128a716fd487a8f6c47f074f4f7b
Merge branch 'caching'

Conflicts:
plugins/network/app/controllers/network_controller.rb
plugins/network/app/views/network/index.html.erb
webclient/app/views/controlpanel/index.rhtml
webclient/app/views/layouts/main.rhtml
webclient/public/images/warning-big.png
webclient/public/stylesheets/new_inputs.css
plugins/network/app/views/network/index.html.erb
webclient/app/views/layouts/main.rhtml