Merge branch 'master' into mvcProjTemplate

Conflicts:
	projecttemplates/RelyingPartyLogic/Utilities.cs
	src/DotNetOpenAuth.sln

1 files changed, 13 insertions, 0 deletions

diff --git a/samples/OpenIdWebRingSsoProvider/Default.aspx.cs b/samples/OpenIdWebRingSsoProvider/Default.aspx.cs
new file mode 100644
index 0000000..1f64fea
--- /dev/null
+++ b/samples/OpenIdWebRingSsoProvider/Default.aspx.cs
@@ -0,0 +1,13 @@
+namespace OpenIdWebRingSsoProvider {
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+	using System.Web;
+	using System.Web.UI;
+	using System.Web.UI.WebControls;
+
+	public partial class _Default : System.Web.UI.Page {
+		protected void Page_Load(object sender, EventArgs e) {
+		}
+	}
+}