Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Sun, 9 May 2010 16:16:43 +0000 (17:16 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 9 May 2010 16:16:43 +0000 (17:16 +0100)
commit61e51f88cc0242dadd3939cd0bbb5197a21cfb94
tree6655ffbf0ee5fc9315d82f7de33f9fdb7d1a6e75
parent303e5d3eb99284ab4fa41be85f831333f2154b0d
parent354a57a9fc2d356cd1f75fef4fb319cfeec07b94
Merge branch 'master' into terms
app/controllers/user_controller.rb