[commits] Horde branch develop updated. f66860bdf9dc3690548438394667fefbfd858068

[Michael M Slusarz]

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

from: 9d1221a19cda2ff179d5c21958e5dfd0f376a9d7

1c8ed4f Merge branch 'master' into develop
eae0c4c Fixes for IMP 5.1 changes
f66860b Merge branch 'develop_local' into develop

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

commit 1c8ed4ff2bcfdb23b184a81be923f1447dfaab95
Merge: 3d662bb 6cb9a16
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 12:06:32 2011 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Core/package.xml
    	framework/Date/package.xml

 framework/ActiveSync/package.xml                                  |   28 +++-
 framework/Core/package.xml                                        |   27 ++++-
 framework/Date/package.xml                                        |   19 +++-
 framework/Service_Weather/lib/Horde/Service/Weather/Base.php      |    8 +-
 .../Service_Weather/lib/Horde/Service/Weather/Current/Base.php    |   20 +++
 .../Service_Weather/lib/Horde/Service/Weather/Period/Base.php     |   18 +++
 .../Service_Weather/lib/Horde/Service/Weather/Period/Google.php   |   10 +--
 .../lib/Horde/Service/Weather/Period/WeatherUnderground.php       |   28 ++---
 .../Service_Weather/lib/Horde/Service/Weather/Period/Wwo.php      |   18 +---
 .../lib/Horde/Service/Weather/WeatherUnderground.php              |   10 ++
 framework/Service_Weather/package.xml                             |   10 +-
 .../Service_Weather/test/Horde/Service/Weather/GoogleTest.php     |    8 ++
 .../test/Horde/Service/Weather/WundergroundTest.php               |    4 +
 framework/Service_Weather/test/Horde/Service/Weather/WwoTest.php  |    8 ++
 .../test/Horde/Service/Weather/fixtures/boston_wunderground.json  |    2 +
 .../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php  |   24 +++-
 imp/lib/Mime/Viewer/Related.php                                   |    6 +
 17 files changed, 184 insertions(+), 64 deletions(-)

http://git.horde.org/horde-git/-/commit/1c8ed4ff2bcfdb23b184a81be923f1447dfaab95

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

commit eae0c4c469d05c7cdb8a96531c61ffb8c81f8b8e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 12:17:49 2011 -0700

    Fixes for IMP 5.1 changes

 imp/js/dimpbase.js     |    8 ++------
 imp/js/message-dimp.js |   10 +++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

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

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

commit f66860bdf9dc3690548438394667fefbfd858068
Merge: 9d1221a eae0c4c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Dec 23 12:29:27 2011 -0700

    Merge branch 'develop_local' into develop

 imp/js/dimpbase.js     |    8 ++------
 imp/js/message-dimp.js |   10 +++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

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