Commit afacd545862526d05caa6f9b33be2e1ceac857f0

Rodrigo Urubatan
Fri Feb 22 04:06:00 CET 2008

Tree SHA1: afdc5e7
Parent SHA1: 42f23f9 (Authentication using restfull_authentication plugin.)
Parent SHA1: 9234dba (restful routes and new plugin for custom resource name.)

Merge branch 'master' of git@gitorious.org:planejamento/mainline

Conflicts:

	config/routes.rb