[commits] Horde branch mnemo_4_2 updated. 80f4ea8aead4a5bf204cb310c94dfbc8fe615b96
Michael J. Rubinsky
mrubinsk at horde.org
Mon Oct 28 04:20:07 UTC 2013
The branch "mnemo_4_2" has been updated.
The following is a summary of the commits.
from: 185fabba8dd12eb2a3b70ae13093ddf61c11ecd7
0d25249 [jan] Don't show admin alarm form if alarms are disabled.
022c49d [mms] Fix iteration of Horde_Prefs_Scope object.
b5a5e77 [mms] Add 'tlsv1' as a secure parameter option in the Client constructor.
388a6c0 [mms] Fix prototype.js issue in IE 9 regarding array iteration in a parent window.
818aa1d Fix variable
e7c90bb Add test for Xoauth2 generation
7d989fe [mms] Added Horde_Smtp_Password_Xoauth2 class.
8845fca [mms] Remove duplicate constructor.
ac1e8de Released Horde_Form-2.0.6
f9e10db Development mode for Horde_Form-2.0.7
8221038 Fix undefined variable.
b6d2bcc Fix
c75f7b0 Set explicitly to inline disposition.
e5c5858 [mms] SECURITY: Protect against CSRF attacks by using tokens on destructive actions (CVE-2013-6275; Bug #12796; Marcela Benetrix <m.benetrix at e-secure.com.au>).
b85ae49 [mms] Use SHA-1 instead of MD5 for internal hashing.
3933752 Update note via ActiveSync: Fix filtering of HTML tags. Bug #12785
07e00f4 Bug: 12784 Fix loss of note body when body is HTML.
e9952a1 Get rid of some E_STRICT errors.
3859fbd Log the error if we have it.
48de084 Fix the $and portion of the aggregation.
ae4ea3ae Fix handling event descriptions if they are provided in HTML/RTF.
e6c9fb6 Check incoming appointments for HTML body types.
22b5441 Simplify, and ensure we always return an array.
a5a9141 API: Fix PHP error when given a list of uids to delete. Bug #12790
ee6c576 BFN
47bd475 Merge branch 'master' into mnemo_4_2
80f4ea8 Fix merge.
Summary: http://github.com/horde/horde/compare/185fabba8dd12eb2a3b70ae13093ddf61c11ecd7...80f4ea8aead4a5bf204cb310c94dfbc8fe615b96
-----------------------------------------------------------------------
commit 0d2524928ef760c3c667c2cd00f63ea85a7f29be
Author: Jan Schneider <jan at horde.org>
Date: Thu Oct 24 18:43:58 2013 +0200
[jan] Don't show admin alarm form if alarms are disabled.
horde/admin/alarms.php | 45 ++++++++++++++++++++++++++-------------------
horde/docs/CHANGES | 1 +
horde/package.xml | 2 ++
3 files changed, 29 insertions(+), 19 deletions(-)
http://github.com/horde/horde/commit/0d2524928ef760c3c667c2cd00f63ea85a7f29be
http://git.horde.org/horde-git/-/commit/0d2524928ef760c3c667c2cd00f63ea85a7f29be
-----------------------------------------------------------------------
commit 022c49d050d1daff8d4ce759af61ccc97d41dad2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 19:48:57 2013 -0600
[mms] Fix iteration of Horde_Prefs_Scope object.
framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +-
framework/Prefs/package.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/022c49d050d1daff8d4ce759af61ccc97d41dad2
http://git.horde.org/horde-git/-/commit/022c49d050d1daff8d4ce759af61ccc97d41dad2
-----------------------------------------------------------------------
commit b5a5e77092fce4fbd9b70d9a2f99aaebbf4d2e9b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 20:14:08 2013 -0600
[mms] Add 'tlsv1' as a secure parameter option in the Client constructor.
framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING | 21 +++++++++++++
framework/Socket_Client/lib/Horde/Socket/Client.php | 14 +++++---
framework/Socket_Client/package.xml | 10 ++++--
3 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING
http://github.com/horde/horde/commit/b5a5e77092fce4fbd9b70d9a2f99aaebbf4d2e9b
http://git.horde.org/horde-git/-/commit/b5a5e77092fce4fbd9b70d9a2f99aaebbf4d2e9b
-----------------------------------------------------------------------
commit 388a6c0db3c0b530583fcd3186a694b71f3d07a1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 22:10:10 2013 -0600
[mms] Fix prototype.js issue in IE 9 regarding array iteration in a parent window.
Got lost when we upgraded prototype.js. But this is an issue when a
window runs code in a parent (the native IE forEach handler does not
correctly set the value of 'this' in the called function).
framework/Core/js/prototype.js | 2 +-
framework/Core/package.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/388a6c0db3c0b530583fcd3186a694b71f3d07a1
http://git.horde.org/horde-git/-/commit/388a6c0db3c0b530583fcd3186a694b71f3d07a1
-----------------------------------------------------------------------
commit 818aa1d2e140f1b4ec3dcd6bc68ce090c79d89c1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 22:23:41 2013 -0600
Fix variable
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 4 ++--
framework/Imap_Client/lib/Horde/Imap/Client/Password/Xoauth2.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/818aa1d2e140f1b4ec3dcd6bc68ce090c79d89c1
http://git.horde.org/horde-git/-/commit/818aa1d2e140f1b4ec3dcd6bc68ce090c79d89c1
-----------------------------------------------------------------------
commit e7c90bb4b690133c2c20937390020192d5936327
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 22:24:02 2013 -0600
Add test for Xoauth2 generation
framework/Imap_Client/package.xml | 10 ++-
framework/Imap_Client/test/Horde/Imap/Client/Xoauth2Test.php | 43 ++++++++++
2 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 framework/Imap_Client/test/Horde/Imap/Client/Xoauth2Test.php
http://github.com/horde/horde/commit/e7c90bb4b690133c2c20937390020192d5936327
http://git.horde.org/horde-git/-/commit/e7c90bb4b690133c2c20937390020192d5936327
-----------------------------------------------------------------------
commit 7d989fe8ca43bfdab8f8859068872e6be5b2fb24
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 22:26:24 2013 -0600
[mms] Added Horde_Smtp_Password_Xoauth2 class.
framework/Smtp/doc/Horde/Smtp/UPGRADING | 13 +++-
framework/Smtp/lib/Horde/Smtp/Password/Xoauth2.php | 70 ++++++++++++++++++++
framework/Smtp/package.xml | 22 ++++--
framework/Smtp/test/Horde/Smtp/Xoauth2Test.php | 43 ++++++++++++
4 files changed, 138 insertions(+), 10 deletions(-)
create mode 100644 framework/Smtp/lib/Horde/Smtp/Password/Xoauth2.php
create mode 100644 framework/Smtp/test/Horde/Smtp/Xoauth2Test.php
http://github.com/horde/horde/commit/7d989fe8ca43bfdab8f8859068872e6be5b2fb24
http://git.horde.org/horde-git/-/commit/7d989fe8ca43bfdab8f8859068872e6be5b2fb24
-----------------------------------------------------------------------
commit 8845fca97ca4d8e5a417aa3c7f70772d4b431606
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 23:30:04 2013 -0600
[mms] Remove duplicate constructor.
This silences a whole host of strict warnings
framework/Form/lib/Horde/Form.php | 7 +------
framework/Form/package.xml | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
http://github.com/horde/horde/commit/8845fca97ca4d8e5a417aa3c7f70772d4b431606
http://git.horde.org/horde-git/-/commit/8845fca97ca4d8e5a417aa3c7f70772d4b431606
-----------------------------------------------------------------------
commit ac1e8de4e2394b9044f5aea57a63af30aecefb35
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 23:31:48 2013 -0600
Released Horde_Form-2.0.6
framework/Form/composer.json | 2 +-
framework/Form/package.xml | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/ac1e8de4e2394b9044f5aea57a63af30aecefb35
http://git.horde.org/horde-git/-/commit/ac1e8de4e2394b9044f5aea57a63af30aecefb35
-----------------------------------------------------------------------
commit f9e10dbda3c6e30e8f77951d7c252ee70c1a97dc
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 23:31:48 2013 -0600
Development mode for Horde_Form-2.0.7
framework/Form/package.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/f9e10dbda3c6e30e8f77951d7c252ee70c1a97dc
http://git.horde.org/horde-git/-/commit/f9e10dbda3c6e30e8f77951d7c252ee70c1a97dc
-----------------------------------------------------------------------
commit 8221038fa15e73b8fe3f4bde7f470403bc1641b0
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:51:04 2013 +0200
Fix undefined variable.
hermes/lib/Driver/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/8221038fa15e73b8fe3f4bde7f470403bc1641b0
http://git.horde.org/horde-git/-/commit/8221038fa15e73b8fe3f4bde7f470403bc1641b0
-----------------------------------------------------------------------
commit b6d2bcc37f02b42c46878cb1077cfbdc6c76768f
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 17:44:27 2013 +0200
Fix
imp/locale/de/LC_MESSAGES/imp.po | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/b6d2bcc37f02b42c46878cb1077cfbdc6c76768f
http://git.horde.org/horde-git/-/commit/b6d2bcc37f02b42c46878cb1077cfbdc6c76768f
-----------------------------------------------------------------------
commit c75f7b0b1b2c821a64acd35b000d4c0eece70a94
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Oct 25 14:54:02 2013 -0400
Set explicitly to inline disposition.
Outlook and other "Windows Communication Apps" require text/calendar
parts to be displayed inline in order for the calendar integration to
work. Our MIME library forces parts with no or empty disposition values
to be set to "attachment" when any other disposition parameters (such
as size) are included, making it impossible to pass through the empty
disposition.
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/c75f7b0b1b2c821a64acd35b000d4c0eece70a94
http://git.horde.org/horde-git/-/commit/c75f7b0b1b2c821a64acd35b000d4c0eece70a94
-----------------------------------------------------------------------
commit e5c585867f908322346b37b43ef6460e7d0096c8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Oct 24 23:42:23 2013 -0600
[mms] SECURITY: Protect against CSRF attacks by using tokens on destructive actions (CVE-2013-6275; Bug #12796; Marcela Benetrix <m.benetrix at e-secure.com.au>).
ingo/docs/CHANGES | 3 ++
ingo/lib/Basic/Base.php | 52 ++++++++++++++++++++++++++++++++++++++++++
ingo/lib/Basic/Blacklist.php | 7 ++++-
ingo/lib/Basic/Filters.php | 16 ++++++++++--
ingo/lib/Basic/Forward.php | 3 +-
ingo/lib/Basic/Rule.php | 17 +++++++++----
ingo/lib/Basic/Script.php | 12 +++++++--
ingo/lib/Basic/Spam.php | 3 +-
ingo/lib/Basic/Vacation.php | 3 +-
ingo/lib/Basic/Whitelist.php | 7 ++++-
ingo/package.xml | 4 +-
11 files changed, 107 insertions(+), 20 deletions(-)
http://github.com/horde/horde/commit/e5c585867f908322346b37b43ef6460e7d0096c8
http://git.horde.org/horde-git/-/commit/e5c585867f908322346b37b43ef6460e7d0096c8
-----------------------------------------------------------------------
commit b85ae495937bda9837bd1f14a392d35a9f03e947
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Oct 25 02:23:49 2013 -0600
[mms] Use SHA-1 instead of MD5 for internal hashing.
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 6 +++---
framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php | 2 +-
framework/Imap_Client/package.xml | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/b85ae495937bda9837bd1f14a392d35a9f03e947
http://git.horde.org/horde-git/-/commit/b85ae495937bda9837bd1f14a392d35a9f03e947
-----------------------------------------------------------------------
commit 393375265d08897a5ccb30dfbb555d512a664c44
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: Wed Oct 23 10:57:21 2013 +0200
Update note via ActiveSync: Fix filtering of HTML tags. Bug #12785
We already filter HTML tags on new, incoming notes.
When notes get updated, we need to filter HTML tags, too.
This fixes updating notes via iOS 7.x
Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
mnemo/lib/Api.php | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/393375265d08897a5ccb30dfbb555d512a664c44
http://git.horde.org/horde-git/-/commit/393375265d08897a5ccb30dfbb555d512a664c44
-----------------------------------------------------------------------
commit 07e00f45ff4c4aad72771bdd69c5b95125ac3abb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Oct 25 16:58:34 2013 -0400
Bug: 12784 Fix loss of note body when body is HTML.
mnemo/lib/Driver.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/07e00f45ff4c4aad72771bdd69c5b95125ac3abb
http://git.horde.org/horde-git/-/commit/07e00f45ff4c4aad72771bdd69c5b95125ac3abb
-----------------------------------------------------------------------
commit e9952a156db7504904a05a122bab37147f2b5a95
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 22:31:14 2013 -0400
Get rid of some E_STRICT errors.
kronolith/lib/Driver/Resource/Sql.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/e9952a156db7504904a05a122bab37147f2b5a95
http://git.horde.org/horde-git/-/commit/e9952a156db7504904a05a122bab37147f2b5a95
-----------------------------------------------------------------------
commit 3859fbd7914c963130d0499510bf651c29339012
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 23:17:14 2013 -0400
Log the error if we have it.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/3859fbd7914c963130d0499510bf651c29339012
http://git.horde.org/horde-git/-/commit/3859fbd7914c963130d0499510bf651c29339012
-----------------------------------------------------------------------
commit 48de084df0dc5b34a7204a62edcdfa60d32b1de9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 23:17:37 2013 -0400
Fix the $and portion of the aggregation.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/48de084df0dc5b34a7204a62edcdfa60d32b1de9
http://git.horde.org/horde-git/-/commit/48de084df0dc5b34a7204a62edcdfa60d32b1de9
-----------------------------------------------------------------------
commit ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 23:18:48 2013 -0400
Fix handling event descriptions if they are provided in HTML/RTF.
Possible fix for Bug: 12797
kronolith/lib/Event.php | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
http://github.com/horde/horde/commit/ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65
http://git.horde.org/horde-git/-/commit/ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65
-----------------------------------------------------------------------
commit e6c9fb68f0b7d0747169893fcf27b4414f3261cd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 23:40:23 2013 -0400
Check incoming appointments for HTML body types.
kronolith/lib/Event.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/e6c9fb68f0b7d0747169893fcf27b4414f3261cd
http://git.horde.org/horde-git/-/commit/e6c9fb68f0b7d0747169893fcf27b4414f3261cd
-----------------------------------------------------------------------
commit 22b54418cd26d088545d8d085721d37d239484e3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 23:49:13 2013 -0400
Simplify, and ensure we always return an array.
Bug: 12791
framework/Core/lib/Horde/Core/ActiveSync/Connector.php | 28 ++++++++-------
1 files changed, 15 insertions(+), 13 deletions(-)
http://github.com/horde/horde/commit/22b54418cd26d088545d8d085721d37d239484e3
http://git.horde.org/horde-git/-/commit/22b54418cd26d088545d8d085721d37d239484e3
-----------------------------------------------------------------------
commit a5a9141ad5fb614e296b892ad671c70e8352c526
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: Thu Oct 24 15:37:05 2013 +0200
API: Fix PHP error when given a list of uids to delete. Bug #12790
When we pass an array of uids to delete,
we should return after processing them.
Fixes this error when using a Kolab backend:
2013-10-23T10:53:27+02:00 WARN: HORDE [mnemo] PHP ERROR: base64_encode() expects parameter 1 to be string, array given [pid 11460 on line 375 of "/datastore/share/pear/Horde/Url.php"]
Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
mnemo/lib/Api.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/a5a9141ad5fb614e296b892ad671c70e8352c526
http://git.horde.org/horde-git/-/commit/a5a9141ad5fb614e296b892ad671c70e8352c526
-----------------------------------------------------------------------
commit ee6c57653ca4d16590f5ec5b3a794e16e2ad262c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Oct 27 23:56:27 2013 -0400
BFN
mnemo/docs/CHANGES | 2 ++
mnemo/package.xml | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/ee6c57653ca4d16590f5ec5b3a794e16e2ad262c
http://git.horde.org/horde-git/-/commit/ee6c57653ca4d16590f5ec5b3a794e16e2ad262c
-----------------------------------------------------------------------
commit 47bd4756abdeda5b950bc083a021821cf6d3b838
Merge: 185fabb ee6c576
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Oct 28 00:05:04 2013 -0400
Merge branch 'master' into mnemo_4_2
Conflicts:
mnemo/docs/CHANGES
mnemo/lib/Api.php
mnemo/lib/Driver.php
mnemo/package.xml
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php | 6 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 10 +-
framework/Core/js/prototype.js | 2 +-
framework/Core/lib/Horde/Core/ActiveSync/Connector.php | 28 ++-
framework/Core/package.xml | 4 +-
framework/Form/composer.json | 2 +-
framework/Form/lib/Horde/Form.php | 7 +-
framework/Form/package.xml | 20 ++-
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 4 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 6 +-
framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Password/Xoauth2.php | 2 +-
framework/Imap_Client/package.xml | 12 +-
framework/Imap_Client/test/Horde/Imap/Client/Xoauth2Test.php | 43 ++++
framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +-
framework/Prefs/package.xml | 4 +-
framework/Smtp/doc/Horde/Smtp/UPGRADING | 13 +-
framework/Smtp/lib/Horde/Smtp/Password/Xoauth2.php | 70 ++++++
framework/Smtp/package.xml | 22 +-
framework/Smtp/test/Horde/Smtp/Xoauth2Test.php | 43 ++++
framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING | 21 ++
framework/Socket_Client/lib/Horde/Socket/Client.php | 14 +-
framework/Socket_Client/package.xml | 10 +-
hermes/lib/Driver/Sql.php | 2 +-
horde/admin/alarms.php | 45 ++--
horde/docs/CHANGES | 1 +
horde/package.xml | 2 +
imp/locale/de/LC_MESSAGES/imp.po | 4 +-
ingo/docs/CHANGES | 3 +
ingo/lib/Basic/Base.php | 52 ++++
ingo/lib/Basic/Blacklist.php | 7 +-
ingo/lib/Basic/Filters.php | 16 +-
ingo/lib/Basic/Forward.php | 3 +-
ingo/lib/Basic/Rule.php | 17 +-
ingo/lib/Basic/Script.php | 12 +-
ingo/lib/Basic/Spam.php | 3 +-
ingo/lib/Basic/Vacation.php | 3 +-
ingo/lib/Basic/Whitelist.php | 7 +-
ingo/package.xml | 4 +-
kronolith/lib/Driver/Resource/Sql.php | 4 +-
kronolith/lib/Event.php | 27 ++-
mnemo/lib/Api.php | 2 +-
mnemo/lib/Driver.php | 9 +-
mnemo/package.xml | 3 +-
44 files changed, 454 insertions(+), 119 deletions(-)
http://github.com/horde/horde/commit/47bd4756abdeda5b950bc083a021821cf6d3b838
http://git.horde.org/horde-git/-/commit/47bd4756abdeda5b950bc083a021821cf6d3b838
-----------------------------------------------------------------------
commit 80f4ea8aead4a5bf204cb310c94dfbc8fe615b96
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Oct 28 00:18:05 2013 -0400
Fix merge.
mnemo/lib/Driver.php | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
http://github.com/horde/horde/commit/80f4ea8aead4a5bf204cb310c94dfbc8fe615b96
http://git.horde.org/horde-git/-/commit/80f4ea8aead4a5bf204cb310c94dfbc8fe615b96
More information about the commits
mailing list