Merge branch 'horde-managesieve'

Conflicts:
	ingo/package.xml

framework/Alarm/test/Horde/Alarm/conf.php.dist

@@ -1,5 +1,5 @@
 <?php
-// Horde_Db configuration.
+// Horde_Alarm configuration.
 $conf['alarm']['sql']['mysql']['host'] = 'localhost';
 $conf['alarm']['sql']['mysql']['username'] = '';
 $conf['alarm']['sql']['mysql']['password'] = '';

framework/ManageSieve/doc/Horde/ManageSieve/LICENSE

@@ -0,0 +1,24 @@
+Copyright 2015 Horde LLC.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HORDE PROJECT
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

framework/ManageSieve/doc/Horde/ManageSieve/UPGRADING

@@ -0,0 +1,58 @@
+============================
+ Upgrading Horde_ManageSieve
+============================
+
+:Contact: dev@lists.horde.org
+
+.. contents:: Contents
+.. section-numbering::
+
+
+This lists the API changes between releases of the package.
+
+
+Upgrading from Net_Sieve
+========================
+
+  - The class name has been changed from Net_Sieve to \Horde\ManageSieve.
+
+  - Constants
+
+    - NET_SIEVE_STATE_DISCONNECTED been renamed to
+      \Horde\ManageSieve\STATE_DISCONNECTED.
+
+    - NET_SIEVE_STATE_AUTHORISATION been renamed to
+      \Horde\ManageSieve\STATE_NON_AUTHENTICATED.
+
+    - NET_SIEVE_STATE_TRANSACTION been renamed to
+      \Horde\ManageSieve\STATE_AUTHENTICATED.
+
+  - Constructor
+
+    - The connection parameters are passed as a hash now, instead of individual
+      arguments.
+
+    - The default port has been changed to 4190.
+
+  - Authentication methods
+
+    The authentication methods are now specified as one of the
+    \Horde\ManageSieve\AUTH_* class constants.
+
+  - Methods
+
+    - haveSpace() has been renamed to hasSpace().
+
+  - Error handling
+
+    - Error handling has been converted to
+      exceptions. \Horde\ManageSieve\Exception objects are thrown instead of
+      PEAR_Error objects returned.
+
+    - getError() has been removed.
+
+  - Logging
+
+    - The debug handler, the debug constructor parameters and the setDebug()
+      method have been removed. Use the 'logger' constructor parameter, or
+      setLogger() instead.