FuXiaoHei c7660a81c6 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	routers/user/user.go

2014-03-19 22:19:17 +08:00

..

repo.go

Merge remote-tracking branch 'origin/master'

2014-03-19 22:19:17 +08:00

single.go

Revert "fork render"

2014-03-19 22:11:28 +08:00