Hao Kung 2a6a24097c Merge fixes ... Conflicts: src/Microsoft.AspNet.Identity/IdentityOptionsSetup.cs test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs		2014-05-06 14:05:12 -07:00
..
Microsoft.AspNet.Identity.Entity.Test	…
Microsoft.AspNet.Identity.InMemory.Test	…
Microsoft.AspNet.Identity.Security.Test	…
Microsoft.AspNet.Identity.Test	Merge fixes	2014-05-06 14:05:12 -07:00
Shared	…