Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 19 insertions, 0 deletions

diff --git a/samples/RelyingPartyPortal/TracePage.aspx.cs b/samples/RelyingPartyPortal/TracePage.aspx.cs
new file mode 100644
index 0000000..0f5b36a
--- /dev/null
+++ b/samples/RelyingPartyPortal/TracePage.aspx.cs
@@ -0,0 +1,19 @@
+using System;

+using System.Collections.Generic;

+using System.Web;

+using System.Web.UI;

+using System.Web.UI.WebControls;

+

+namespace ConsumerPortal {

+	public partial class TracePage : System.Web.UI.Page {

+		protected void Page_Load(object sender, EventArgs e) {

+			placeHolder1.Controls.Add(new Label { Text = Global.LogMessages.ToString() });

+		}

+

+		protected void clearLogButton_Click(object sender, EventArgs e) {

+			Global.LogMessages.Length = 0;

+			// clear the page immediately, and allow for F5 without a Postback warning.

+			Response.Redirect(Request.Url.AbsoluteUri);

+		}

+	}

+}