From 4d50464a82ce66a3ffd3a83e76224c3aae205601 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Mon, 16 Jul 2012 12:30:03 +0300
Subject: [PATCH] catch up to master

---
 select2-latest.html | 43 ++++++++++++++++++++++++++-----------------
 select2-master      |  2 +-
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/select2-latest.html b/select2-latest.html
index 3d569a4f..262bd6a8 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1180,7 +1180,7 @@ $("#tags").select2({
         <p>Gets or sets the selection. Analogous to <code>val</code> method, but works with objects instead of ids.</p>
 
 
-        <div class="row">
+    <div class="row">
         <div class="span12"><h3>destroy</h3></div>
     </div>
     <p>Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.</p>
@@ -1249,20 +1249,29 @@ $("#tags").select2({
 
       </section>
 
+    <div class="row">
+        <div class="span12">
+            <h3>Configuring Defaults</h3>
+            Select2 exposes its default options via the <code>$.fn.select2.defaults</code> object. Properties changed in this object (same properties configurable through the constructor) will take effect for every instance created after the change
+            
+        </div>
+    </div>
 
-    <!--
-    <div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
-    <script>
-        $(document).ready(function() {
-           var el=$("#focus-spy");
-           $(window).bind("scroll", function(){ el.css({top:$(window).scrollTop()}); });
-           var update=function() {
-                var a=document.activeElement;
-                var b=$(a);
-                el.html("tag: "+a.tagName+" id:"+a.id+" class:"+b.attr("class")+" val:"+b.val());
-                window.setTimeout(update, 100);
-           };
-           update();
-        });
-    </script>
-    -->
\ No newline at end of file
+
+
+<!--
+<div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
+<script>
+    $(document).ready(function() {
+       var el=$("#focus-spy");
+       $(window).bind("scroll", function(){ el.css({top:$(window).scrollTop()}); });
+       var update=function() {
+            var a=document.activeElement;
+            var b=$(a);
+            el.html("tag: "+a.tagName+" id:"+a.id+" class:"+b.attr("class")+" val:"+b.val());
+            window.setTimeout(update, 100);
+       };
+       update();
+    });
+</script>
+-->
\ No newline at end of file
diff --git a/select2-master b/select2-master
index 5d2bcd40..0c4888c6 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 5d2bcd4007cd6391c569884f98971a6db0b31e5d
+Subproject commit 0c4888c6ef10cadc25d87750aee6e912f1d389b4