From eeb29c3ae2877ed92219b810d7ac80db026a5f2f Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Mon, 16 Jul 2012 11:38:47 +0300
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index d2f8c12b..7c189e33 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -218,6 +218,7 @@ $("#e10_3").select2({
                     <li>Signature of <code>initSeletion</code> has changed to support initialization from asynchronous requests.</li>
                     <li>Dropdown will now open below or above the control depending on available screen space. No more scrolling the page to see to see all matched results.</li>
                     <li>Signature of <code>formatSelection</code> and <code>formatResult</code> changed in a backwards compatible way to support more powerful constructs than supported by strings alone.</li>
+                    <li>Separator in multi-valued selects is now cofigurable, <code>,</code> still the default. See <code>separator</code> option in the docs.</li>
                 </ul>
             </div></div>
         </section>
@@ -855,6 +856,12 @@ $("#e18,#e18_2").select2();
                     for the placeholder to work.
                 </p>
             </td></tr>
+            <tr><td>separator</td><td>string</td><td>
+                <p>
+                    Separator character or string used to delimit ids in <code>value</code> attribute of the multi-valued selects.
+                    The default delimiter is the <code>,</code> character.
+                </p>
+            </td></tr>
             <tr>
                 <td>allowClear</td>
                 <td>boolean</td>
diff --git a/select2-master b/select2-master
index d6f506e1..c17336d1 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit d6f506e16bbec859bb9fc39e1467112ed422ec0c
+Subproject commit c17336d1ac26a12083cfcbefdf213f25ec8c1dde