CB#1173

Merge branch 'groupmanager'

Conflicts:
	lib/bukkit-0.0.1-SNAPSHOT.jar
	lib/craftbukkit-0.0.1-SNAPSHOT.jar

EssentialsGroupManager/src/Changelog.txt

@@ -12,4 +12,5 @@ v 1.1:
     - Fixed BukkitPerms population. Wasn't correctly setting superperms.
     - Push updates to superperms for all valid GM commands.
     - All GroupManager commands issued by players are now echoed in the console.
-    - Reverted WorldHolder static change to maintain backward plugin compatability.
+    - Reverted WorldHolder static change to maintain backward plugin compatibility.
+    - Update to handle 'getDescription().getPermissions(') returning a list (CB 1172).

EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java

@@ -96,7 +96,8 @@ public class BukkitPermissions {
     private void collectPermissions() {
         registeredPermissions.clear();
         for (Plugin bukkitPlugin : Bukkit.getServer().getPluginManager().getPlugins()) {
-            registeredPermissions.addAll(bukkitPlugin.getDescription().getPermissions());
+        	for(Permission permission : bukkitPlugin.getDescription().getPermissions())
+            registeredPermissions.add(permission);
         }
     }