Merge 0.9->0.10

diff --cc tools/jabberd14sql2prosody.lua
Simple merge

diff --cc util/dataforms.lua
index b38d0e274373c3923ad11cdd30a336b73f05e40f,01a8eef327c1ac566a0ecfabb997c03207f6f237..c352858c67a11883cd20f5e9f528da53a6806e4c
--- 1/util/dataforms.lua
--- 2/util/dataforms.lua
+++ b/util/dataforms.lua
@@@ -94,6 -94,15 +94,15 @@@ function form_t.form(layout, data, form
                        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