From 5821ba2776adf87ecd8e8f105fe761a7fd07e9c7 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Mon, 7 May 2012 08:27:14 -0700
Subject: [PATCH] catch up to master

---
 index.html     | 11 ++++++++++-
 select2-master |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 85e4a071..04a1ba3e 100755
--- a/index.html
+++ b/index.html
@@ -764,7 +764,16 @@ $("#e14_destroy").click(function() { $("#e14").select2("destroy"); });
                     </p>
                 </td>
             </tr>
-
+            <tr><td>id</td><td>function</td><td>
+                   Function used to get the id from the choice object or a string representing the key under which the id is stored.
+                   <pre>id(object)</pre>
+                   <table class="table table-bordered table-striped">
+                       <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
+                       <tr><td>object</td><td>object</td><td>A choice object</td></tr>
+                       <tr><td>&lt;returns&gt;</td><td>string</td><td>the id of the object</td></tr>
+                   </table>
+                   The default implementation expects the object to have a <code>id</code> property that is returned.
+            </td></tr>
             <tr><td>formatSelection</td><td>function</td><td>
                 Function used to render the current selection.
                 <pre>formatSelection(object)</pre>
diff --git a/select2-master b/select2-master
index 011770a5..a6edacc5 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 011770a5d5572d6dd26dca2f01d6b2d0723f4733
+Subproject commit a6edacc50563db0005cf06986a31a4a2fe322f4a