Merge branch 'master' into ldap-auth
authorJuho Nieminen <juho.nieminen@jyu.fi>
Fri, 16 Apr 2010 12:03:57 +0000 (15:03 +0300)
committerJuho Nieminen <juho.nieminen@jyu.fi>
Fri, 16 Apr 2010 12:03:57 +0000 (15:03 +0300)
commite4ec992575bd066496f92e43cf01a9aa79b7be96
treec6f20c80bfaf5989cbd1f5cbd4858e8a1918a47e
parent06888afb772d4290068654f106e0e054055d814c
parent4ca132242f093b00c3c336d31c5db40552bf870a
Merge branch 'master' into ldap-auth
app/models/user.rb