Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/password/package.xml

@@ -15,9 +15,9 @@
      <email>alec@alec.pl</email>
      <active>yes</active>
   </lead>
   <date>2012-03-07</date>
   <date>2012-11-15</date>
   <version>
      <release>3.1</release>
      <release>3.2</release>
      <api>2.0</api>
   </version>
   <stability>
@@ -26,13 +26,8 @@
   </stability>
   <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
   <notes>
- Added pw_usermod driver (#1487826)
- Added option password_login_exceptions (#1487826)
- Added domainfactory driver (#1487882)
- Added DBMail driver (#1488281)
- Helper files moved to helpers/ directory from drivers/
- Added Expect driver (#1488363)
- Added Samba password (#1488364)
- Fix wrong (non-specific) error message on crypt or connection error (#1488808)
- Added option to define IMAP hosts that support password changes - password_hosts
    </notes>
   <contents>
      <dir baseinstalldir="/" name="/">
@@ -331,5 +326,26 @@
- Fixed drivers namespace issues
            </notes>
        </release>
        <release>
           <date>2012-03-07</date>
           <version>
              <release>3.1</release>
              <api>2.0</api>
           </version>
           <stability>
              <release>stable</release>
              <api>stable</api>
           </stability>
           <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
           <notes>
- Added pw_usermod driver (#1487826)
- Added option password_login_exceptions (#1487826)
- Added domainfactory driver (#1487882)
- Added DBMail driver (#1488281)
- Helper files moved to helpers/ directory from drivers/
- Added Expect driver (#1488363)
- Added Samba password (#1488364)
            </notes>
        </release>
    </changelog>
</package>