From 4d2990af7fe8fd919f1bc6c6b734ef0a906e56db Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 14 Feb 2013 19:53:15 -0800
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 482ce2fe..7f41fbba 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -186,6 +186,11 @@ $("#e10_3").select2({
     formatSelection: format,
     formatResult: format
 });
+$("#e10_4").select2({
+    data:function() { return { results: data }; },
+    formatSelection: format,
+    formatResult: format
+});
 
 });
 </script>
@@ -521,6 +526,11 @@ $("#e19").select2({ maximumSelectionSize: 3 });
              <p>
                  <input type="hidden" id="e10_3" style="width:300px"/>
              </p>
+             <p><code>data</code> can also itself be a function that returns a results object:</p>
+             <p>
+                 <input type="hidden" id="e10_4" style="width:300px"/>
+             </p>
+
          </div>
          <div class="span8">
            <h3>Example Code</h3>
diff --git a/select2-master b/select2-master
index 76cd1453..7d908da5 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 76cd1453800aee9f6188355e21d2c2c0bb71c544
+Subproject commit 7d908da52fab3af0d0341b4fc454aa0c4db80b72