From a9a0db5aa4de4f09820147aacd2918486df5279b Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Mon, 27 Aug 2012 09:52:19 -0700
Subject: [PATCH] catch up to master

---
 select2-latest.html | 4 ++++
 select2-master      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/select2-latest.html b/select2-latest.html
index e02936e3..aac17777 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1272,6 +1272,10 @@ $("#tags").select2({
             <tr><td>dropdownCssClass</td><td>function/string</td><td>
                 Css class that will be added to select2's dropdown container
             </td></tr>
+            <tr><td>escapeMarkup</td><td>function</td><td>
+                <code>String escapeMarkup(String markup)</code>
+                <p>Function used to post-process markup returned from formatter functions. By default this function escapes html entities to prevent javascript injection.</p>
+            </td></tr>
         </table>
 
       <div class="row">
diff --git a/select2-master b/select2-master
index 69567cd2..7baa3b9e 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 69567cd2cb96ae0d8832308903c9c35ff6b263a8
+Subproject commit 7baa3b9e93690b7dacad8fbb22f71b8a3940e04d