Merge remote branch 'origin/fcbk-fix'
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 5 Jun 2010 04:53:28 +0000 (23:53 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 5 Jun 2010 04:53:28 +0000 (23:53 -0500)
commit49cda2436284491b6f105b311bb85b883a5b9838
tree93b72f189c7200a8306378c194c96f7748a3945e
parent74dd4acf763af6c83d0a9820c92faf64bd2edff1
parent67e9e15641c9e92bf4573ee5f72ff26621a55350
Merge remote branch 'origin/fcbk-fix'

Conflicts:
app/stylesheets/application.sass
config/asset_packages.yml
app/controllers/questions_controller.rb
app/stylesheets/application.sass
config/asset_packages.yml
public/javascripts/application.js