Merge branch 'v2.5' into monoorigin/mono

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

1 files changed, 0 insertions, 23 deletions

diff --git a/samples/ProviderCustomStore/Server.aspx.designer.cs b/samples/ProviderCustomStore/Server.aspx.designer.cs
deleted file mode 100644
index 6a53f1f..0000000
--- a/samples/ProviderCustomStore/Server.aspx.designer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.1434

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-

-

-public partial class Server {

-    

-    /// <summary>

-    /// Form1 control.

-    /// </summary>

-    /// <remarks>

-    /// Auto-generated field.

-    /// To modify move field declaration from designer file to code-behind file.

-    /// </remarks>

-    protected global::System.Web.UI.HtmlControls.HtmlForm Form1;

-}