Merge pull request #107 from Gravatronics/optionTypes

author Alexander Ebert <ebert@woltlab.com>

Thu, 18 Aug 2011 15:43:54 +0000 (08:43 -0700)

committer Alexander Ebert <ebert@woltlab.com>

Thu, 18 Aug 2011 15:43:54 +0000 (08:43 -0700)
author Alexander Ebert <ebert@woltlab.com>
Thu, 18 Aug 2011 15:43:54 +0000 (08:43 -0700)
committer Alexander Ebert <ebert@woltlab.com>
Thu, 18 Aug 2011 15:43:54 +0000 (08:43 -0700)
diff --cc wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Thu, 18 Aug 2011 15:43:54 +0000 (08:43 -0700)
committer	Alexander Ebert <ebert@woltlab.com>
	Thu, 18 Aug 2011 15:43:54 +0000 (08:43 -0700)
		1	2
wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php	patch \|	diff1 \|	diff2 \|	blob \| history