Merge remote branch 'upstream/next' into ui
authorFrancisco Rodriguez <francisco.rodriguez@finario.com>
Wed, 13 Apr 2011 21:25:16 +0000 (16:25 -0500)
committerFrancisco Rodriguez <francisco.rodriguez@finario.com>
Wed, 13 Apr 2011 21:25:16 +0000 (16:25 -0500)
commit0f4af1d207d49769818c8eee329533d881958232
tree822e922118ebf2c7fef61558aa4b1ed0d0f56222
parent2ed5b5e1a153806d985d3b01bc86628ddd95ddc7
parent7cca34791a6be2aa8592de1fb3be3fa943b206dc
Merge remote branch 'upstream/next' into ui
app/views/questions/_form.html.haml