Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/cleanup

author Matthias Schmidt <gravatronics@live.com>

Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)

committer Matthias Schmidt <gravatronics@live.com>

Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
author Matthias Schmidt <gravatronics@live.com>
Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
committer Matthias Schmidt <gravatronics@live.com>
Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
diff --cc wcfsetup/install/files/lib/data/package/Package.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
Simple merge
author	Matthias Schmidt <gravatronics@live.com>
	Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
committer	Matthias Schmidt <gravatronics@live.com>
	Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
		1	2
wcfsetup/install/files/lib/data/package/Package.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/style/ActiveStyle.class.php	patch \|	diff1 \|	diff2 \|	blob \| history