Merge remote branch 'origin/answer-specs' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 23 Jan 2011 19:41:12 +0000 (14:41 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 23 Jan 2011 19:41:12 +0000 (14:41 -0500)
commit2452d973558481838f4effc516d2b2ba345dbac9
tree36639ea61b24052aeebed9de9449692e65375adf
parent5c5d057b9c40a82abaeb066892f3d11b2c7acc52
parent3f20a81280731d20296301901c9b03b1fdfbeb05
Merge remote branch 'origin/answer-specs' into next

Conflicts:
Gemfile.lock
Gemfile
Gemfile.lock