Erick Tryzelaar 188425ffe5 Merge branch 'v0.6.x' into master ... # Conflicts: # serde_codegen/Cargo.toml		2015-12-08 09:50:10 -05:00
..
src	Merge remote-tracking branch 'remotes/origin/v0.6.x'	2015-11-28 21:16:51 -08:00
build.rs	Initial support for syntex	2015-05-18 23:34:17 -07:00
Cargo.toml	Merge branch 'v0.6.x' into master	2015-12-08 09:50:10 -05:00