From 943b4d634a7b9a834830e8c850f746344a06ccca Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 10 Jan 2013 08:50:06 -0800
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index 1baf483c..4e6ea180 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1378,6 +1378,10 @@ $("#tags").select2({
             <tr><td>selectOnBlur</td><td>boolean</td><td>
                 <p>Set to <code>true</code> if you want Select2 to select the currently highlighted option when it is blurred</p>
             </td></tr>
+            <tr><td>loadMorePadding</td><td>integer</td><td>
+                Defines how many results need to be below the fold before the next page is loaded. The default value is <code>0</code> which means the result list needs to be scrolled all the way to the bottom for the next page of results to be loaded. This option can be used to trigger the load sooner, possibly resulting in a smoother user experience.
+            </td></tr>
+
         </table>
 
       <div class="row">
diff --git a/select2-master b/select2-master
index b562d1a0..5f282809 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit b562d1a0e55678117be6248adc84823280dfb6be
+Subproject commit 5f2828098e6e98f33efe6db39555c4708e5a7240