Merge 0.7->trunk

diff --cc plugins/muc/muc.lib.lua
Simple merge

diff --cc prosody
Simple merge

diff --cc util/xmppstream.lua
index a0be4a8e957cff05ce4386407f89ccd361ed09f6,a0be4a8e957cff05ce4386407f89ccd361ed09f6..f7744feaebf23bae79c1e8f3151dfca9e164800b
--- 1/util/xmppstream.lua
--- 2/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@@ -1,6 -1,6 +1,6 @@@
  -- Prosody IM
---- Copyright (C) 2008-2009 Matthew Wild
---- Copyright (C) 2008-2009 Waqas Hussain
++-- Copyright (C) 2008-2010 Matthew Wild
++-- Copyright (C) 2008-2010 Waqas Hussain
  -- 
  -- This project is MIT/X11 licensed. Please see the
  -- COPYING file in the source package for more information.