Merge branch 'v3.2'

Conflicts:
	src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
	src/DotNetOpenAuth.sln
	src/DotNetOpenAuth/OpenId/Provider/IProviderBehavior.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/IRelyingPartyBehavior.cs

1 files changed, 4 insertions, 2 deletions

diff --git a/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs b/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs
index d836261..813ff62 100644
--- a/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs
+++ b/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -678,8 +678,9 @@ namespace OpenIdProviderWebForms.Code {
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            public NonceRow FindByCodeContext(string Code, string Context) {
+            public NonceRow FindByIssuedCodeContext(System.DateTime Issued, string Code, string Context) {
                 return ((NonceRow)(this.Rows.Find(new object[] {
+                            Issued,
                             Code,
                             Context})));
             }
@@ -715,6 +716,7 @@ namespace OpenIdProviderWebForms.Code {
                 this.columnExpires = new global::System.Data.DataColumn("Expires", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnExpires);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnIssued,
                                 this.columnCode,
                                 this.columnContext}, true));
                 this.columnContext.AllowDBNull = false;