Merge branch 'master' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 15 Jan 2011 20:35:19 +0000 (15:35 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 15 Jan 2011 20:35:19 +0000 (15:35 -0500)
commit6ecff63b1ae8c09811a8181550a01e192439078c
treed89b1732db2e0b9d2219b59f224c50a1470ab1a6
parent9cb8bebdee08e68a41cbaef5df1ebc1b625ea81c
parentd32d8224eaf95ff840fdcf719cb266cce7b4a3d3
Merge branch 'master' into next

Conflicts:
app/controllers/answers_controller.rb
app/controllers/questions_controller.rb
app/controllers/users_controller.rb
app/controllers/answers_controller.rb
app/controllers/comments_controller.rb
app/controllers/questions_controller.rb
app/controllers/users_controller.rb