Merge branch 'master' into use-activeresource
authorMartin Vidner <mvidner@suse.cz>
Mon, 12 Oct 2009 09:19:40 +0000 (11:19 +0200)
committerMartin Vidner <mvidner@suse.cz>
Mon, 12 Oct 2009 09:19:40 +0000 (11:19 +0200)
commit51580c1b38e913546aea6e9861ab16f80328eba8
tree3a82b8d28acca6c25f30009ff70be2361a8ea030
parent7445d6af6e556a1a50fe5e07e171a8edb6dddc2a
parent8995e9531536c3503d944d385d0ff44eb54a17c7
Merge branch 'master' into use-activeresource
plugins/network/app/controllers/network_controller.rb