[commits] Horde branch develop updated. 37808c1ba13998e5142e9dfd8c08c9bd8cd9c42c

[Jan Schneider]

The branch "develop" has been updated.
The following is a summary of the commits.

from: f87426b8fc6b5f02f2f1b58ef0d6330445f5fa03

737ac0c Fix tests.
6771a59 Update tests.
0682aed Make tests locale independent.
f4d7250 Fix autoloading.
66d868f Make tests locale independent.
37808c1 Merge branch 'master' into develop

-----------------------------------------------------------------------

commit 737ac0cf77758606c9304a07e743837092359757
Author: Jan Schneider <jan at horde.org>
Date:   Sat Mar 17 18:22:46 2012 +0100

    Fix tests.

 framework/Template/test/Horde/Template/Autoload.php     |   29 +++++----------
 framework/Template/test/Horde/Template/TemplateTest.php |    6 ++-
 2 files changed, 14 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/737ac0cf77758606c9304a07e743837092359757

-----------------------------------------------------------------------

commit 6771a5982d02eef47efcfb08c4c64d367ed1b0af
Author: Jan Schneider <jan at horde.org>
Date:   Sat Mar 17 18:27:41 2012 +0100

    Update tests.

 .../Horde/Notification/Class/Notification/Event/StatusTest.php    |    2 +-
 .../test/Horde/Notification/Class/Notification/EventTest.php      |    2 +-
 .../Class/Notification/Handler/Decorator/AlarmTest.php            |    2 +-
 .../Class/Notification/Handler/Decorator/HordelogTest.php         |    2 +-
 .../Notification/Class/Notification/Handler/Decorator/LogTest.php |    2 +-
 .../test/Horde/Notification/Class/Notification/HandlerTest.php    |    2 +-
 .../Horde/Notification/Class/Notification/Listener/AudioTest.php  |    2 +-
 .../Horde/Notification/Class/Notification/Listener/StatusTest.php |    2 +-
 .../test/Horde/Notification/Class/Notification/ListenerTest.php   |    2 +-
 .../test/Horde/Notification/Class/NotificationTest.php            |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/6771a5982d02eef47efcfb08c4c64d367ed1b0af

-----------------------------------------------------------------------

commit 0682aed3f211d71df5c650d5e6960f2e75d15f07
Author: Jan Schneider <jan at horde.org>
Date:   Sat Mar 17 18:37:10 2012 +0100

    Make tests locale independent.

 framework/Exception/test/Horde/Exception/ExceptionTest.php        |    2 ++
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/OptionsTest.php |    1 +
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/CliTest.php         |    1 +
 .../test/Horde/Kolab/Storage/Unit/Data/Format/MimeTest.php        |    1 +
 .../test/Horde/Service/Weather/WundergroundTest.php               |    1 +
 5 files changed, 6 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/0682aed3f211d71df5c650d5e6960f2e75d15f07

-----------------------------------------------------------------------

commit f4d7250715f565b292ddff80473a41bf7870095b
Author: Jan Schneider <jan at horde.org>
Date:   Sat Mar 17 18:37:23 2012 +0100

    Fix autoloading.

 framework/Kolab_Filter/test/Horde/Kolab/Filter/Autoload.php |   26 ++---------
 1 files changed, 5 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/f4d7250715f565b292ddff80473a41bf7870095b

-----------------------------------------------------------------------

commit 66d868f3f4b300def9a9e579961f5f9d5e5d4dd5
Author: Jan Schneider <jan at horde.org>
Date:   Sat Mar 17 18:40:25 2012 +0100

    Make tests locale independent.

 .../Kolab_Filter/test/Horde/Kolab/Filter/Integration/CliTest.php  |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/66d868f3f4b300def9a9e579961f5f9d5e5d4dd5

-----------------------------------------------------------------------

commit 37808c1ba13998e5142e9dfd8c08c9bd8cd9c42c
Merge: f87426b 66d868f
Author: Jan Schneider <jan at horde.org>
Date:   Sat Mar 17 22:09:58 2012 +0100

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Kolab_Filter/test/Horde/Kolab/Filter/Autoload.php

 framework/Exception/test/Horde/Exception/ExceptionTest.php        |    2 +
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/OptionsTest.php |    1 +
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/CliTest.php         |    1 +
 framework/Kolab_Filter/test/Horde/Kolab/Filter/Autoload.php       |   26 +---
 .../Kolab_Filter/test/Horde/Kolab/Filter/Integration/CliTest.php  |    1 +
 .../Horde/Notification/Class/Notification/Event/StatusTest.php    |    2 +-
 .../test/Horde/Notification/Class/Notification/EventTest.php      |    2 +-
 .../Class/Notification/Handler/Decorator/AlarmTest.php            |    2 +-
 .../Class/Notification/Handler/Decorator/HordelogTest.php         |    2 +-
 .../Notification/Class/Notification/Handler/Decorator/LogTest.php |    2 +-
 .../test/Horde/Notification/Class/Notification/HandlerTest.php    |    2 +-
 .../Horde/Notification/Class/Notification/Listener/AudioTest.php  |    2 +-
 .../Horde/Notification/Class/Notification/Listener/StatusTest.php |    2 +-
 .../test/Horde/Notification/Class/Notification/ListenerTest.php   |    2 +-
 .../test/Horde/Notification/Class/NotificationTest.php            |    2 +-
 .../test/Horde/Service/Weather/WundergroundTest.php               |    1 +
 framework/Template/test/Horde/Template/Autoload.php               |   29 ++---
 framework/Template/test/Horde/Template/TemplateTest.php           |    6 +-
 18 files changed, 35 insertions(+), 52 deletions(-)

http://git.horde.org/horde-git/-/commit/37808c1ba13998e5142e9dfd8c08c9bd8cd9c42c