Merge branch 'master' of https://github.com/davidstutz/bootstrap-multiselect

dist/js/bootstrap-multiselect.js

@@ -235,8 +235,7 @@
              */
             buttonText: function(options, select) {
                 if (this.disabledText.length > 0
-                        && (this.disableIfEmpty || select.prop('disabled')) 
-                        && options.length == 0) {
+                        && (select.prop('disabled') || (options.length == 0 && this.disableIfEmpty))  {
                     
                     return this.disabledText;
                 }