Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	wcfsetup/install/files/acp/js/WCF.ACP.js
	wcfsetup/install/files/js/WCF.js

diff --cc wcfsetup/install/files/acp/js/WCF.ACP.js
index 51ad383f02a30ce907277f25ba4bad09af579d77,4af13911f785cf2a579f2794461e908482899b3f..ecb5779700c84ccf1f6c48c115fb058423f990e3
--- 1/wcfsetup/install/files/acp/js/WCF.ACP.js
--- 2/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@@ -487,21 -487,12 +487,23 @@@ WCF.ACP.Options.prototype = 
                        }
                }
        }
++
++
  };
  
 +/**
 + * Namespace for WCF.ACP.User
 + */
  WCF.ACP.User = {};
  
 +/**
 + * UserList clipboard API
 + */
  WCF.ACP.User.List = function() { this.init(); };
  WCF.ACP.User.List.prototype = {
 +      /**
 +       * Initializes the UserList clipboard API.
 +       */
        init: function() {
                $('body').bind('clipboardAction', $.proxy(this.handleClipboardEvent, this));
        },

diff --cc wcfsetup/install/files/js/WCF.js
index a8f93aa49798ee964999385fa148088432eb4a5c,46b885ee32375bd059c9f45d95840e40f8629522..141ac6ee9d611a9aa810c19f9ef56aa054622f78
--- 1/wcfsetup/install/files/js/WCF.js
--- 2/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@@ -408,6 -408,6 +408,7 @@@ $.extend(WCF, 
  });
  
  /**
++
   * Clipboard API
   */
  WCF.Clipboard = {