Merge 0.6->0.7

This commit is contained in:
Matthew Wild 2010-03-22 17:24:55 +00:00
commit 46c0b8c7f9
97 changed files with 258 additions and 238 deletions

View file

@ -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.