From 3ae57100c82a3053d741e4f8a2786deebecfa321 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 19 Nov 2014 11:52:37 +1100
Subject: [PATCH] fix merge

---
 src/Umbraco.Web/umbraco.presentation/library.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs
index 4b97dffe5f..8b74c54929 100644
--- a/src/Umbraco.Web/umbraco.presentation/library.cs
+++ b/src/Umbraco.Web/umbraco.presentation/library.cs
@@ -529,7 +529,8 @@ namespace umbraco
             var serializer = new EntityXmlSerializer();
             var serialized = serializer.Serialize(
                 ApplicationContext.Current.Services.MediaService, 
-                ApplicationContext.Current.Services.DataTypeService,                
+                ApplicationContext.Current.Services.DataTypeService,
+                ApplicationContext.Current.Services.UserService,                
                 media, 
                 deep);
             return serialized;