Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt...

Conflicts:
	Gemfile.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index fe8af81,9638d0a..0965974
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -354,8 -349,7 +360,7 @@@ GE
        rdoc (~> 3.4)
        thor (>= 0.14.6, < 2.0)
      raindrops (0.10.0)
 -    rake (10.0.1)
 +    rake (10.0.3)
-     raphael-rails (1.5.2)
      rb-fsevent (0.9.2)
      rb-inotify (0.8.8)
        ffi (>= 0.5.0)
@@@ -522,10 -515,9 +527,10 @@@ DEPENDENCIE
    pygments.rb!
    quiet_assets (~> 1.0.1)
    rack-mini-profiler
 -  rails (= 3.2.9)
 +  rails (= 3.2.10)
    rails-dev-tweaks
-   raphael-rails (= 1.5.2)
 +  rails_best_practices
+   raphael-rails!
    rb-fsevent
    rb-inotify
    redcarpet (~> 2.2.2)