[commits] Horde branch master updated. 815b0c2839ae386d52bb3cc653f770afbc89d200

[Michael J. Rubinsky]

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

from: f6ccf3be789be1f276775e462ba78e0ce98e9e36

5a4f5b6 This is new functionality, belongs in next point release.
815b0c2 changes

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

commit 5a4f5b64eb33a9a42bcd18d7b710128bca18a849
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 11:26:20 2013 -0400

    This is new functionality, belongs in next point release.
    
    Sort of forgot that Trean was already released :)

 trean/docs/CHANGES              |    2 -
 trean/lib/Application.php       |    1 -
 trean/lib/Bookmarks.php         |    8 +--
 trean/lib/Data/Json.php         |  114 ---------------------------------------
 trean/package.xml               |   14 +----
 trean/templates/data/import.inc |   25 ---------
 turba/lib/Application.php       |    8 ---
 7 files changed, 6 insertions(+), 166 deletions(-)
 delete mode 100644 trean/lib/Data/Json.php
 delete mode 100644 trean/templates/data/import.inc

http://git.horde.org/horde-git/-/commit/5a4f5b64eb33a9a42bcd18d7b710128bca18a849

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

commit 815b0c2839ae386d52bb3cc653f770afbc89d200
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 11:30:08 2013 -0400

    changes

 trean/docs/CHANGES |    2 ++
 trean/package.xml  |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/815b0c2839ae386d52bb3cc653f770afbc89d200