From dee9e2dc943b23de04316e9f8b272e2d49f72def Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 7 Aug 2012 22:24:14 -0700
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index 85215c2a..0b1bb87f 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1004,6 +1004,16 @@ $("#e18,#e18_2").select2();
                 </pre>
                 </p>
             </td></tr>
+            <tr><td>formatResultCssClass</td><td>function</td><td>
+                Function used to add css classes to result elements
+                <pre>formatResultCssClass(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>One of the result objects returned from the <code>query</code> function</td></tr>
+                    <tr><td>&lt;returns&gt;</td><td>string (optional)</td><td>String containing css class names separated by a space</td></tr>
+                </table>
+                <p class="alert alert-info">By default when attached to a <code>select</code> css classes from <code>option</code>s will be automatically copied</p>
+            </td></tr>
             <tr><td>formatNoMatches</td><td>function</td><td>
                 Function used to render the &quot;No matches&quot; message
                 <pre>formatNoMatches(term)</pre>
diff --git a/select2-master b/select2-master
index e7dee23c..1ef57f86 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit e7dee23c08cafa0488ff6de5f5861122868380b1
+Subproject commit 1ef57f86af94bfe7aa5cdbbc4932dda4eb9de1d8