Upstream merge

By: md_5 <git@md-5.net>

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

@@ -1,14 +1,14 @@
-From 5d672b1aa92376a8e13540221f774f14ff96b2d7 Mon Sep 17 00:00:00 2001
+From 061b904c4d4c86c60283080b60e44d0a7ca68abe 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 7a5b5ed..6b4bcac 100644
+index 4f33ff4..7390a77 100644
 --- a/src/main/java/org/bukkit/conversations/ConversationContext.java
 +++ b/src/main/java/org/bukkit/conversations/ConversationContext.java
-@@ -44,6 +44,14 @@ public class ConversationContext {
+@@ -46,6 +46,14 @@ public class ConversationContext {
      }
  
      /**
@@ -20,9 +20,9 @@ index 7a5b5ed..6b4bcac 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.
-      *
+      * Gets session data shared between all {@link Prompt} invocations. Use
+      * this as a way to pass data through each Prompt as the conversation
+      * develops.
 -- 
-1.8.1.2
+1.8.3.2