From 8dac088bab87b8f96c7822307281cae492141d3e Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 17 Jul 2012 16:45:44 +0300
Subject: [PATCH] catch up to master

---
 select2-latest.html | 10 +++++++---
 select2-master      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/select2-latest.html b/select2-latest.html
index a23cb188..db8776dc 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -219,6 +219,7 @@ $("#e10_3").select2({
                     <li>Dropdown will now open below or above the control depending on available screen space. No more scrolling the page to see to see all matched results.</li>
                     <li>Signature of <code>formatSelection</code> and <code>formatResult</code> changed in a backwards compatible way to support more powerful constructs than supported by strings alone.</li>
                     <li>Separator in multi-valued selects is now cofigurable, <code>,</code> still the default. See <code>separator</code> option in the docs.</li>
+                    <li>Matching is now customizable. See <a href="#doc-matcher">matcher</a> function in the docs and the <a href="#matcher">Custom Matcher</a> example.</li>
                 </ul>
             </div></div>
         </section>
@@ -918,15 +919,18 @@ $("#e18,#e18_2").select2();
                    </table>
                    The default implementation expects the object to have a <code>id</code> property that is returned.
             </td></tr>
-            <tr><td>matcher</td><td>function</td><td>
+            <tr><td id="doc-matcher">matcher</td><td>function</td><td>
                 Used to determine whether or not the search term matches an option when a built-in query function is used.
                 The built in query function is used when Select2 is attached to a <code>select</code>, or the <code>local</code> or <code>tags</code> helpers are used.
-                <pre>matcher(term, text)</pre>
+                <pre>matcher(term, text, option)</pre>
                 <table class="table table-bordered table-striped">
                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
                     <tr><td>term</td><td>string</td><td>search term</td></tr>
                     <tr><td>text</td><td>string</td><td>text of the option being matched</td></tr>
-                    <tr><td>&lt;returns&gt;</td><td>boolean</td><td><code>true</code> if search term matches the option text, or <code>false</code> otherwise</td></tr>
+                    <tr><td>option</td><td>jquery object</td>
+                        <td>the <code>option</code> element we are trying to match. Only given when attached to <code>select</code>.
+                            Can be used to match against custom attributes on the <code>option</code> tag in addition to matching on the <code>option</code>'s text.</code></td></tr>
+                    <tr><td>&lt;returns&gt;</td><td>boolean</td><td><code>true</code> if search term matches the text, or <code>false</code> otherwise</td></tr>
                 </table>
                 The default implementation is case insensitive and matches anywhere in ther term:
                 <code>function(term, text) { return text.toUpperCase().indexOf(term.toUpperCase())>0; }</code>
diff --git a/select2-master b/select2-master
index 3ed2cc09..3a830a2b 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 3ed2cc091ac473c8610c41e5b9941939007f1e02
+Subproject commit 3a830a2b81755bd0ba754defa4899cf164f13fc7