2.0-beta-0.9: Merge remote-tracking branch 'origin/master' into appendix

schacon
2014-10-07T20:28:25Z

Conflicts:
book/10-git-internals/sections/refs.asc