auto merge of #4859 : glennw/servo/fix-3986, r=larsbergstrom

This commit is contained in:
bors-servo 2015-02-08 08:51:43 -07:00
commit 13b49ddf44
2 changed files with 6 additions and 4 deletions