Merge remote-tracking branch 'shapado-github/master'
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Sun, 2 Oct 2011 22:22:04 +0000 (17:22 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Sun, 2 Oct 2011 22:22:04 +0000 (17:22 -0500)
commit95689aed21da920973a46aed6953ee9570bf9095
tree55de67dca95617371b3cf5ab8db89272694cfccc
parentd206a5557c82a813c782f27b8a7eba2f13c8413c
parent535304679681aa105ebfd1c201b59e9c68664f05
Merge remote-tracking branch 'shapado-github/master'

Conflicts:
Gemfile.lock
Gemfile
Gemfile.lock
app/helpers/application_helper.rb