Merge branch 'next' into facebook-app
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 14 Jun 2011 02:59:52 +0000 (21:59 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 14 Jun 2011 02:59:52 +0000 (21:59 -0500)
commit8789e190b173e8544d8493c80f4c62f84618675f
treeab387c9ec62167d3344e982d619c23d2998fdf86
parent985ccccbec4feee0e4a8a11ffdb4efc8f994565d
parentfe3db14f5772b9aa399d86e8f63c690ed8ba81db
Merge branch 'next' into facebook-app
config/routes.rb