Merge remote-tracking branch 'ui/ui' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 3 May 2011 20:10:35 +0000 (15:10 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 3 May 2011 20:10:35 +0000 (15:10 -0500)
commit55f3aad98e8d8aa0b6c3d78a0adc1e51b58e96b6
tree5c1a6ddc4327acd71c440fd40f5e9490949085bf
parent018a3f4d300a1758d5f8ce62f326434cf8b83bf0
parent02df6712a0291ad4bf01d11dd09fb3c84029a53e
Merge remote-tracking branch 'ui/ui' into next

Conflicts:
app/views/questions/show.html.haml
app/views/questions/show.html.haml