20afc7b78ba8860f390a61233b8f070b3b77d906 4c0ad24b133710ff932c99c36c044c6c414530b8 AP ap@klotzi.(none) http://github.com/dima767/grails-crowd/commit/5d7f2c43a85461976c5708b00ce16f108284bbe2 5d7f2c43a85461976c5708b00ce16f108284bbe2 2008-10-08T03:58:54-07:00 2008-10-08T03:58:54-07:00 Merge branch 'master' of git://github.com/dima767/grails-crowd Conflicts: application.properties 6f3887661a4a53c95c0bbdb91d783bc2e453326b AP ap@klotzi.(none)