Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
	CHANGELOG

diff --cc CHANGELOG
index a7ab8f5,a121cc2..d1644d6
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -16,7 -16,7 +16,8 @@@ v 6.5.
    - Use jquery timeago plugin
    - Fix 500 error for rdoc files
    - Ability to customize merge commit message (sponsored by Say Media)
 +  - Search autocomplete via ajax
+   - Add website url to user profile
  
  v6.4.3
    - Don't use unicorn worker killer if PhusionPassenger is defined