From f1b92593c348ed6cc3c872e67f28d841c71a8726 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Sun, 23 Jun 2013 14:36:30 -0700
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index e971e4c2..4a806cbf 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1195,6 +1195,7 @@ $(document).ready(function () {
                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
                     <tr><td>object</td><td>object</td><td>The selected result object returned from the <code>query</code> function</td></tr>
                     <tr><td>container</td><td>jQuery object</td><td>jQuery wrapper of the node to which the selection should be appended</td></tr>
+                    <tr><td>escapeMarkup</td><td>function</td><td>Function that can be used to escape html markup. This is the function defined in the <code>escapeMarkup</code>option, or the default.</td></tr>
                     <tr><td>&lt;returns&gt;</td><td>string (optional)</td><td>Html string, a DOM element, or a jQuery object that renders the selection</td></tr>
                 </table>
                 <p>The default implementation expects the object to have a <code>text</code> property that is returned.</p>
diff --git a/select2-master b/select2-master
index 1415567a..ef136731 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 1415567a70fc0e95d4bfaf2ec8f66962ece36582
+Subproject commit ef136731d459a4a5fafbc5f934fc1566e307d847