FuXiaoHei 9bc06dc716 Merge remote-tracking branch 'origin/master' ... Conflicts: routers/user/user.go		2014-03-19 22:23:46 +08:00
..
footer.tmpl
head.tmpl
navbar.tmpl