recorded merge of revisions 1486-1491 via svnmerge from http://Dessa@svn.froxlor.org/branches/philderbeast

This commit is contained in:
Robert Foerster (Dessa)
2010-11-27 10:37:44 +00:00
parent e4b7bf799d
commit 060b3f8782
7 changed files with 60 additions and 49 deletions

View File

@@ -71,7 +71,7 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO
$version = '0.9.14';
$version = '0.9.15-svn1';
$dbversion = '2';
$branding = '';