Andreas Stephanides f17b269458 Merge remote-tracking branch 'remotes/origin/master' ...

Conflicts:
	app/controllers/config_controller.rb
	app/views/config/index.html.erb
	config/routes.rb

2013-02-17 15:57:05 +01:00

..

index.html.erb

Merge remote-tracking branch 'remotes/origin/master'

2013-02-17 15:57:05 +01:00