yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh ... Conflicts: Gemfile app/controllers/users_controller.rb db/schema.rb		2014-05-30 10:57:13 +08:00
..
en.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-05-28 15:40:57 +08:00
zh.yml	Merge remote-tracking branch 'remotes/origin/develop' into szzh	2014-05-30 10:57:13 +08:00