bastichelaar/salt — comment on commit 8fd62abc70c5d39335b720fb6716aca80495de05
File:  line 0
By SEJeff:

Would it be correct to guess this is a broken merge commit of some sort? This doesn't look right at all.