for deploy
for deploy
for deploy
Merge branch 'master' of git://github.com/daqing/rabel
Merge branch 'master' of git://github.com/daqing/rabel
Merge branch 'master' of git://github.com/daqing/rabel
Merge branch 'master' of git://github.com/daqing/rabel
Merge branch 'master' of git://github.com/daqing/rabel

Conflicts:
	Gemfile.lock
deploy config
Merge branch 'master' of git://github.com/daqing/rabel
Merge remote-tracking branch 'rable/master'
Merge branch 'master' of git://github.com/daqing/rabel
Merge branch 'master' of git://github.com/daqing/rabel
Merge remote-tracking branch 'rable/master'

Conflicts:
	Gemfile
	Gemfile.lock
deploy config
thin deploy config
deploy config
Merge branch 'master' of git://github.com/daqing/rabel

Conflicts:
	Gemfile
	Gemfile.lock
deploy
Merge branch 'master' of git://github.com/daqing/rabel

Conflicts:
	Gemfile.lock