Upstream merge

By: md_5 <md_5@live.com.au>

Bukkit-Patches/0014-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -1,14 +1,14 @@
-From 7dcd6e3e77ee83a18170832951b483718b7543e3 Mon Sep 17 00:00:00 2001
+From 1f0602e700904904b1d77ec02b066f955dcf6ea0 Mon Sep 17 00:00:00 2001
 From: Alex Bennett <alex.eugene.bennett@gmail.com>
 Date: Thu, 11 Jul 2013 15:31:32 -0500
 Subject: [PATCH] Added getAllSessionData() to the Conversation API.
 
 
 diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java
-index 4ff9858..22aa1a9 100644
+index 7a5b5ed..6b4bcac 100644
 --- a/src/main/java/org/bukkit/conversations/ConversationContext.java
 +++ b/src/main/java/org/bukkit/conversations/ConversationContext.java
-@@ -42,6 +42,14 @@ public class ConversationContext {
+@@ -44,6 +44,14 @@ public class ConversationContext {
      }
  
      /**
@@ -22,7 +22,7 @@ index 4ff9858..22aa1a9 100644
 +    /**
       * Gets session data shared between all {@link Prompt} invocations. Use this as a way
       * to pass data through each Prompt as the conversation develops.
-      * @param key The session data key.
+      *
 -- 
 1.8.1.2