ednapiranha/bedrock — comment on commit e54cebb2457a31161b6d289740fbff4f6e524a9c
File:  line 0
By jlongster:

I merged this in but there was a conflict. I fixed it and created a new commit, so I wouldn't work on this branch anymore. Resync it first with mozilla/master.

Thanks!