Missing the semicolon symbol
Merge pull request #319 from geekcraik/master

Missing the semicolon symbol
Don't reset so --hard

This was trashing the local copy, which means that we erased our generated files.

Fixes #318
Merge pull request #320 from steveklabnik/fix_deploy_for_real

Don't reset so --hard
Future-proof git add

https://travis-ci.org/rust-lang/rust-by-example/builds/43929603#L411
Merge pull request #321 from steveklabnik/master

Future-proof git add
Regenerate CNAME on deploy.

Previously, we had just relied on having a CNAME existing on the branch. Now that the deploy script regenerates things, it didn't make a new CNAME, which caused Bad Things.
Merge pull request #322 from steveklabnik/master

Regenerate CNAME on deploy.
Fix 'ace is not defined' with hax

This is clearly not the _right_ thing, but it does get things working for now.
Merge pull request #323 from steveklabnik/master

Fix 'ace is not defined' with hax
roll back https://github.com/rust-lang/rust-by-example/pull/321

apparently our build isn't clean, so this doesn't work.
Merge pull request #324 from steveklabnik/master

roll back https://github.com/rust-lang/rust-by-example/pull/321
build with gitbook@0.7.1

https://botbot.me/mozilla/rust-internals/2014-12-13/?msg=27476787&page=5

:heart: @japaric
Merge pull request #325 from steveklabnik/master

build with gitbook@0.7.1
Fix git warning for real

Sigh.
Merge pull request #327 from steveklabnik/master

Fix git warning for real