From 84ac3c29299f19af6a53995c2b21b18eb2ae8df0 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Wed, 18 Jul 2012 09:56:17 +0300
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index 623a37f9..41536643 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1184,16 +1184,17 @@ $("#tags").select2({
                   </tr>
 
               </table>
-
-
           </td></tr>
       </table>
-      Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
+        <p><code>val</code> method invoked on a single-select with an unset value will return <code>""</code>, while a <code>val</code> method invoked on an empty multi-select will return <code>[]</code></p>
+
+        Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
 
         <div class="row">
             <div class="span12"><h3>data</h3></div>
         </div>
         <p>Gets or sets the selection. Analogous to <code>val</code> method, but works with objects instead of ids.</p>
+        <p><code>data</code> method invoked on a single-select with an unset value will return <code>null</code>, while a <code>data</code> method invoked on an empty multi-select will return <code>[]</code></p>
 
 
     <div class="row">
diff --git a/select2-master b/select2-master
index 3a830a2b..ad9fac45 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 3a830a2b81755bd0ba754defa4899cf164f13fc7
+Subproject commit ad9fac45aee04b3b91b186a539ceedb784ab242b