Diff

util/xmppstream.lua @ 2926:fc96d439453b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Mar 2010 17:26:12 +0000
parent 2925:692b3c6c5bd2
parent 2921:f0ddfd7739ea
child 3032:38459cffaf67
line wrap: on
line diff
--- a/util/xmppstream.lua	Mon Mar 22 16:55:10 2010 +0000
+++ b/util/xmppstream.lua	Mon Mar 22 17:26:12 2010 +0000
@@ -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.