Merge branch 'master' of https://github.com/lifthrasiir/rust-encoding … …

…into rustup_20140618

Manishearth committed Jun 18, 2014