Automated commit at 2013-07-31 17:51:56 UTC by middleman-deploy 3.0.14
Automated commit at 2013-07-31 17:52:11 UTC by middleman-deploy 3.0.14
Automated commit at 2013-08-01 07:19:18 UTC by middleman-deploy 3.0.14
Merge branch 'gh-pages' of github.com:ruby-china/rubyconfchina.org into gh-pages

Conflicts:
	index.html
Automated commit at 2013-08-02 18:14:04 UTC by middleman-deploy 3.0.14