Cleanup merge breakage
authorTom Hughes <tom@compton.nu>
Sat, 21 May 2011 13:05:55 +0000 (14:05 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 21 May 2011 13:05:55 +0000 (14:05 +0100)
commit4e38994d1b287300d6ebd5a34583ade657fb3149
tree5f39b178a67e7515a875236958ac053e3217cdc9
parent2a635ab28f3f567f984ec21f6fa724db9b673851
Cleanup merge breakage
test/fixtures/users.yml