Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent

Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
This commit is contained in:
Stephan
2013-10-10 15:52:09 +02:00
49 changed files with 1175 additions and 261 deletions

View File

@@ -21,7 +21,6 @@ using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Tests.Stubs;
using Umbraco.Web;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.PublishedCache.XmlPublishedCache;