auto merge of #4527 : Ms2ger/servo/indentation-plugins, r=larsbergstrom

This commit is contained in:
bors-servo 2015-01-01 13:27:43 -07:00
commit f41324c2a1