Merge commit '0f25029ff6531095782a567bf054d6bc209e2a56' into 7.0.2

Conflicts: src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
2013-12-16 16:21:38 +11:00
parent fcacc1bd71 0f25029ff6
commit 64b247157c
4 changed files with 4 additions and 4 deletions
--- a/src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
+++ b/src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// A cache provider that caches items in the HttpContext.Items
    /// </summary>
-    internal class HttpRequestCacheProvider : DictionaryCacheProdiverBase
+    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
    {
        private readonly Func<HttpContextBase> _context;