From 859b24e3c1795706e8f7586029eda9b9df4ddd6b Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Wed, 25 Jul 2012 14:08:48 +0300
Subject: [PATCH] catch up to master

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

diff --git a/select2-latest.html b/select2-latest.html
index 6d52e6d2..37b27006 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -86,7 +86,7 @@ $("#e5").select2({
 <script id="script_e6">
 $(document).ready(function() {
 $("#e6").select2({
-    placeholder: {title: "Search for a movie", id: ""},
+    placeholder: "Search for a movie",
     minimumInputLength: 1,
     ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
@@ -113,7 +113,7 @@ $("#e6").select2({
 <script id="script_e7">
 $(document).ready(function() {
 $("#e7").select2({
-    placeholder: {title: "Search for a movie", id: ""},
+    placeholder: "Search for a movie",
     minimumInputLength: 3,
     ajax: {
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
diff --git a/select2-master b/select2-master
index 3e42cae4..bb51eb71 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 3e42cae401b79a716d7e8cc1cbfe680626a761e0
+Subproject commit bb51eb712012d25c966905c9e2e1c61192d9f58e