From 9e9afba9a36215f34a99b645be7e3c52fd67f6c3 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 8 Jan 2013 10:48:33 -0800
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index 169d5180..1baf483c 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1319,7 +1319,7 @@ $("#tags").select2({
                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
                     <tr><td>transport</td><td>function</td><td>Function that will be used to perform the ajax request. Must be parameter-compatible with <code>$.ajax</code>. Defaults to <code>$.ajax</code> if not specified.
                         Allows the use of various ajax wrapper libraries such as: <a href="http://www.protofunc.com/scripts/jquery/ajaxManager/">AjaxManager</a>. </td></tr>
-                    <tr><td>url</td><td>string</td><td>Ajax url</td></tr>
+                    <tr><td>url</td><td>string/function</td><td>String containing the ajax url or a function that returns such a string.</td></tr>
                     <tr><td>dataType</td><td>string</td><td>Data type for the request. <code>ajax</code>, <code>jsonp</code>, other formats supported by jquery</td></tr>
                     <tr><td>quietMillis</td><td>int</td><td>Number of milliseconds to wait for the user to stop typing before issuing the ajax request</td></tr>
                     <tr><td>data</td><td>function</td><td>
diff --git a/select2-master b/select2-master
index b4f6462b..b562d1a0 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit b4f6462bb29d485bc158580b62e84812267165c5
+Subproject commit b562d1a0e55678117be6248adc84823280dfb6be