Merge branch 'v3.4' into oauthWRAP

Conflicts:
	samples/OAuthConsumer/Web.config
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/MessagingStrings.Designer.cs
	src/DotNetOpenAuth/Messaging/MessagingStrings.resx
	src/version.txt

1 files changed, 0 insertions, 22 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs b/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs
deleted file mode 100644
index 4cc4860..0000000
--- a/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using DotNetOpenAuth.Messaging;
-using DotNetOpenAuth.OAuth.Messages;
-
-/// <summary>
-/// A custom web app version of the message sent to request an unauthorized token.
-/// </summary>
-public class RequestScopedTokenMessage : UnauthorizedTokenRequest {
-	/// <summary>
-	/// Initializes a new instance of the <see cref="RequestScopedTokenMessage"/> class.
-	/// </summary>
-	/// <param name="endpoint">The endpoint that will receive the message.</param>
-	/// <param name="version">The OAuth version.</param>
-	public RequestScopedTokenMessage(MessageReceivingEndpoint endpoint, Version version) : base(endpoint, version) {
-	}
-
-	/// <summary>
-	/// Gets or sets the scope of the access being requested.
-	/// </summary>
-	[MessagePart("scope", IsRequired = true)]
-	public string Scope { get; set; }
-}