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

Conflicts:
	conf/app.ini

1 files changed, 1 insertions, 1 deletions

diff --git a/gogs.go b/gogs.go
index b94cf0e0..8ae7449e 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.0.0913 Beta"
+const APP_VER = "0.5.2.0916 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())