Merge branch 'master' into xulmus

Conflicts:
	License.txt
This commit is contained in:
Doug Kearns committed 2009-03-29 12:34:05 +11:00
commit 3b667419f8
41 files changed
+264 -82

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or