Merge branch 'dev' of github.com:gogits/gogs into dev

Conflicts:
	conf/app.ini

diff --cc conf/app.ini
index cb907b22de2b5b301466592c46eb76b60a6a701f,c94afe07262b930fb2edba258d2ace66d79babe8..099e80525e5b1e597d366b5ea33c60759ff59623
--- 1/conf/app.ini
--- 2/conf/app.ini
+++ b/conf/app.ini
@@@ -253,8 -253,5 +253,8 @@@ DRIVER 
  CONN =
  
  [i18n]
- LANGS = en-US,zh-CN,de-DE
- NAMES = English,简体中文,Deutsch
+ LANGS = en-US,zh-CN,de-DE,fr-CA
+ NAMES = English,简体中文,Deutsch,Français
 +
 +[git]
 +MAX_GITDIFF_LINES = 10000

diff --cc modules/setting/setting.go
Simple merge