Merge remote branch 'origin/html5-geo' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 05:36:16 +0000 (00:36 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 05:36:16 +0000 (00:36 -0500)
commit645340793733df7df4720b6a6d4e52c48e78847d
tree6227824c64e9eb8930a4edd7584bccd20b83cb9d
parent2ad40a4a6ad6bbf726f9636214ca57a814e5e573
parent75beb5850160ef02e5bf8d5cf0560ae0b82881f4
Merge remote branch 'origin/html5-geo' into next
app/models/group.rb
app/views/questions/show.html.haml