Merge branch 'master' into 6.0.7

Conflicts: README.md
2013-06-19 14:22:57 +02:00
parent a4098b5d25 9ac4c7aef5
commit baa0069262
5 changed files with 63 additions and 19 deletions
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -31,6 +31,7 @@ using umbraco.NodeFactory;
 using umbraco.presentation.templateControls;
 using Content = umbraco.cms.businesslogic.Content;
 using Macro = umbraco.cms.businesslogic.macro.Macro;
+using MacroErrorEventArgs = Umbraco.Core.Events.MacroErrorEventArgs;

 namespace umbraco
 {