Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	models/action.go
release/v1.15
Unknown 2014-05-01 21:31:16 -04:00
commit 8bbaf9550a

Diff Content Not Available