Merge remote branch 'upstream/jc-newui' into ui
authorFrancisco Rodriguez <francisco.rodriguez@finario.com>
Sun, 13 Feb 2011 08:38:45 +0000 (03:38 -0500)
committerFrancisco Rodriguez <francisco.rodriguez@finario.com>
Sun, 13 Feb 2011 08:38:45 +0000 (03:38 -0500)
commit8d9931e0773e9571d6e9cf222a40b2907c591548
tree2136f11e87ec42fff6902ee4071b93072d0da95e
parent7489f2dc417cb06c0f44a33c39d900155078521d
parentc6cb456b7e549d5c985581a606dad4888d9f83af
Merge remote branch 'upstream/jc-newui' into ui
app/views/questions/show.html.haml