Merge branch 'master' of git://github.com/ivaynberg/select2

select2.js

@@ -758,9 +758,7 @@
         },
 
         getPlaceholder: function () {
-            var placeholder = this.opts.element.data("placeholder");
-            if (placeholder !== undefined) return placeholder;
-            return this.opts.placeholder;
+            return this.opts.element.attr("placeholder") || this.opts.element.data("placeholder") || this.opts.placeholder;
         },
 
         /**