Merge remote-tracking branch 'origin/next' into next-memberships
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Wed, 8 Jun 2011 20:26:02 +0000 (15:26 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Wed, 8 Jun 2011 20:26:02 +0000 (15:26 -0500)
commit0e5073b2bca3e09f184d2abc19574417ac84085f
tree3a5cd3e18f4c3ef826cb606af39c285b493de65c
parent3312ed70e77f1bf603f681d6e0297a8d6e16a3c6
parentfe28a9ab714a6d16ded9dcf5f0969a320a033bd1
Merge remote-tracking branch 'origin/next' into next-memberships

Conflicts:
app/views/users/show.html.haml
spec/controllers/votes_controller_spec.rb
Gemfile.lock
app/views/users/show.html.haml