[commits] Horde branch develop updated. 051de5db6f43d3a57b5a23e74f32a861d51f93bf

[Michael J. Rubinsky]

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

from: b9d2cfbd470cbb0d7034d845cc64a25b1c0d5be7

c270337 Fix description for the Services_Weather test.
98ddf07 No need for this in master.
d6d5810 Merge branch 'master' into develop
051de5d Readd MyTopo support to develop.

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

commit c2703379e166da463460568d5a64bba95f5c3f84
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 27 12:23:41 2012 -0400

    Fix description for the Services_Weather test.
    
    This is only used for the METAR block. The weather block uses
    Horde_Service_Weather now.

 horde/lib/Test.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 98ddf07004b5d1033d2962b7165b48ae271865e3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 27 13:44:15 2012 -0400

    No need for this in master.

 horde/config/conf.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/98ddf07004b5d1033d2962b7165b48ae271865e3

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

commit d6d5810df3791bdd46009b340d095992f56a5960
Merge: b9d2cfb 98ddf07
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 27 13:45:05 2012 -0400

    Merge branch 'master' into develop

 horde/config/conf.xml |    1 -
 horde/lib/Test.php    |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

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

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

commit 051de5db6f43d3a57b5a23e74f32a861d51f93bf
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 27 13:45:19 2012 -0400

    Readd MyTopo support to develop.

 framework/Core/js/map/mytopo.js |    5 +++--
 framework/Core/lib/Horde.php    |    6 +++++-
 horde/config/conf.xml           |    2 ++
 horde/lib/Application.php       |    2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/051de5db6f43d3a57b5a23e74f32a861d51f93bf