Merge branch 'rustup_20141221' into incremental
Conflicts: Cargo.toml src/color.rs src/parser.rs src/serializer.rs src/tests.rs src/tokenizer.rs
SimonSapin
committed
Jan 5, 2015
Merge branch 'rustup_20141221' into incremental
Conflicts: Cargo.toml src/color.rs src/parser.rs src/serializer.rs src/tests.rs src/tokenizer.rs