Merge branch 'v0.6.x'

# Conflicts:
#	serde_codegen/Cargo.toml
This commit is contained in:
Erick Tryzelaar
2016-01-10 11:54:46 -08:00
6 changed files with 14 additions and 17 deletions
-1
View File
@@ -4,7 +4,6 @@ use syntax::ast::{
Ident,
MetaItem,
Item,
Expr,
};
use syntax::ast;
use syntax::codemap::Span;