Expire fog links after 34 years
Reduce Fog expiration period to 17 years
Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq
Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq