Merge remote-tracking branch 'origin/rails32' into new-ui
authorJorge Cuadrado <kuadrosxx@gmail.com>
Fri, 3 Feb 2012 21:24:10 +0000 (16:24 -0500)
committerJorge Cuadrado <kuadrosxx@gmail.com>
Fri, 3 Feb 2012 21:24:10 +0000 (16:24 -0500)
commit1fdd16b7ed8bc1a66d5f088eb2d6771e1db72f0f
tree7ab3990d7d97240787389e5c08e77a0f0e1f6b97
parent369968c22ef4f753b7828905bc73ae7d866eb79d
parent18751fc0544395480a2051c8d185882d43cc5d9e
Merge remote-tracking branch 'origin/rails32' into new-ui

Conflicts:
Gemfile
Gemfile.lock
Gemfile
Gemfile.lock