# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1398205356 -7200
# Node ID 2ae6e9063e88870b713e1ceaa7408ce5163596e7
# Parent  ac4f8770d9aafa6edda89e11961281cd2a908f5d# Parent  7dcd6f124c934b6ee0ac9aadeba5c4af497ef937
Merge 0.9->0.10

diff -r ac4f8770d9aa -r 2ae6e9063e88 tools/jabberd14sql2prosody.lua
--- a/tools/jabberd14sql2prosody.lua	Tue Apr 22 21:56:06 2014 +0200
+++ b/tools/jabberd14sql2prosody.lua	Wed Apr 23 00:22:36 2014 +0200
@@ -428,7 +428,7 @@
 end
 
 -- import modules
-package.path = package.path.."..\?.lua;";
+package.path = package.path..";../?.lua;";
 
 local my_name = arg[0];
 if my_name:match("[/\\]") then
diff -r ac4f8770d9aa -r 2ae6e9063e88 util/dataforms.lua
--- a/util/dataforms.lua	Tue Apr 22 21:56:06 2014 +0200
+++ b/util/dataforms.lua	Wed Apr 23 00:22:36 2014 +0200
@@ -94,6 +94,15 @@
 			end
 		end
 
+		local media = field.media;
+		if media then
+			form:tag("media", { xmlns = "urn:xmpp:media-element", height = media.height, width = media.width });
+			for _, val in ipairs(media) do
+				form:tag("uri", { type = val.type }):text(val.uri):up()
+			end
+			form:up();
+		end
+
 		if field.required then
 			form:tag("required"):up();
 		end