Merge remote branch 'origin/master'

Conflicts:
	lib/PermissionsEx.jar
This commit is contained in:
Sleaker 2011-10-28 16:27:28 -07:00
commit e29b044cff
2 changed files with 1 additions and 1 deletions

Binary file not shown.

View File

@ -274,4 +274,4 @@ public class Permission_PermissionsEx extends Permission {
}
return groupNames;
}
}
}