Merge branch 'master' into openstreetbugs
[rails.git] / test / fixtures / user_blocks.yml