| commit | 25f06f48e4f1c685b07b0be07536fea43af99483 | |
| author | Andrew Arnott <andrewarnott@gmail.com> | |
| Sun, 4 Jan 2009 22:43:54 +0000 (4 14:43 -0800) | ||
| committer | Andrew <andrewarnott@gmail.com> | |
| Sun, 4 Jan 2009 22:43:54 +0000 (4 14:43 -0800) | ||
| tree | f33d2e4ee38b85c56152dd91758a6256b8a48259 | treesnapshot (tar.gz zip) |
| parent | b46976c5ff8e452c61b44386a4b376139d8f1f71 | commitdiff |
| parent | a1e1abd9500ed6590eb0b0e56e0866603b069d81 | commitdiff |
Merge branch 'master' into rpauth2
Conflicts:
src/DotNetOpenAuth.Test/OpenId/OpenIdCoordinator.cs
src/DotNetOpenAuth/Messaging/ErrorUtilities.cs
Conflicts:
src/DotNetOpenAuth.Test/OpenId/OpenIdCoordinator.cs
src/DotNetOpenAuth/Messaging/ErrorUtilities.cs
| src/DotNetOpenAuth/Messaging/ErrorUtilities.cs | diff1 | diff2 | blobhistory |