[commits] Horde branch develop updated. 2d3f53f21ead749ca1654cc4fc2cad1612133b25

[Michael J. Rubinsky]

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

from: 670f030fb3696557130ee8369213295822e0b4c7

e9638e7 Merge resolution?
2d3f53f Add field for Mytopo maps api key

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

commit e9638e7b64d8f07086ed3991b2da0d6ea9d81568
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:25:59 2011 -0400

    Merge resolution?

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

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

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

commit 2d3f53f21ead749ca1654cc4fc2cad1612133b25
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:27:57 2011 -0400

    Add field for Mytopo maps api key

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

http://git.horde.org/horde-git/-/commit/2d3f53f21ead749ca1654cc4fc2cad1612133b25