git2 version which compiles with rustc 0.12.0-dev
Rename identifiers that have become keywords

It compiles with rustc 0.12.0-dev.