Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index 86d5b0a06..d9cd002dd 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -9,14 +9,14 @@
 class CommentController < ApplicationController
     before_filter :check_read_only, :only => [ :new ]
     protect_from_forgery :only => [ :new ]
-    
+
     def new
         if params[:type] == 'request'
             @info_request = InfoRequest.find_by_url_title(params[:url_title])
             @track_thing = TrackThing.create_track_for_request(@info_request)
             if params[:comment]
                 @comment = Comment.new(params[:comment].merge({
-                    :comment_type => 'request', 
+                    :comment_type => 'request',
                     :user => @user
                 }))
             end
@@ -38,7 +38,7 @@ class CommentController < ApplicationController
             # Default to subscribing to request when first viewing form
             params[:subscribe_to_request] = true
         end
-        
+
         # See if values were valid or not
         if !params[:comment] || !@existing_comment.nil? || !@comment.valid? || params[:reedit]
             render :action => 'new'