Automated commit at 2013-07-31 08:13:46 UTC by middleman-deploy 3.0.14
Automated commit at 2013-07-31 08:14:35 UTC by middleman-deploy 3.0.14
Automated commit at 2013-08-01 06:08:04 UTC by middleman-deploy 3.0.14
Automated commit at 2013-08-01 06:09:25 UTC by middleman-deploy 3.0.14
Automated commit at 2013-08-01 06:12:19 UTC by middleman-deploy 3.0.14
Merge branch 'gh-pages' of github.com:ruby-china/rubyconfchina.org into gh-pages

Conflicts:
	index.html