Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_e...

Conflicts:
	lib/gitlab/encode.rb

diff --cc app/views/refs/_tree_file.html.haml
Simple merge

diff --cc lib/gitlab/encode.rb
index a9660fa,1a81acc..1c95a94
--- 1/lib/gitlab/encode.rb
--- 2/lib/gitlabhq/encode.rb
+++ b/lib/gitlab/encode.rb
@@@ -1,4 -1,7 +1,6 @@@
 -
 -module Gitlabhq
+ # Patch Strings to enable detect_encoding! on views
+ require 'charlock_holmes/string'
 +module Gitlab
    module Encode 
      extend self