From 0268582b4a2010a79d05a8e62903d686c2057b16 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Wed, 11 Sep 2013 08:14:08 -0700
Subject: [PATCH] catch up to master

---
 select2-master    | 2 +-
 select2-test.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/select2-master b/select2-master
index 6aea56b9..b4083330 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 6aea56b96243309148626934cf77fbe8479c4ede
+Subproject commit b4083330b329e2f2811c267a6dedda0d361abb50
diff --git a/select2-test.html b/select2-test.html
index 06c6613a..f597c41d 100644
--- a/select2-test.html
+++ b/select2-test.html
@@ -35,10 +35,10 @@
     <input type="text" size="30"/><br/>
     <label for="e4">Label: </label>
     <div style="white-space: nowrap">
-    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<select id="e4" style="width:300px" >
+    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<select multiple id="e42" style="width:300px" >
         <optgroup label="Alaskan/Hawaiian Time Zone">
-            <option value="AK">Alaska</option>
-            <option value="HI">Hawaii</option>
+            <option value="AK" data-locked="true" selected="selected">Alaska</option>
+            <option value="HI" disabled="disabled" selected="selected">Hawaii</option>
         </optgroup>
         <optgroup label="Pacific Time Zone">
             <option value="CA">California</option>