• Auto merge of #17 - servo:serde, r=glennw 

    Allow both serde 0.6 and 0.7 and remove Cargo.lock file
    @bors-servo
    bors-servo committed Mar 9, 2016
    a4d2e91