[commits] Horde branch master updated. 4f41be649aa39f39194f4d5a62a36810af7641f3

[Michael J. Rubinsky]

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

from: 7b2a56445a3dd4f401dd662fc9b5f02bf12fb285

ba6c93d Add link for import page.
d780a76 Ignore mozilla's "smart" bookmarks.
4f41be6 There is no "next" step, name this accordingly.

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

commit ba6c93dd07d96d090404f5513b4ef6c92d02ac4d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:34:27 2013 -0400

    Add link for import page.

 trean/lib/Application.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

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

commit d780a763f5c6fb07c179253f3d35bb44d5aaed41
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:34:47 2013 -0400

    Ignore mozilla's "smart" bookmarks.

 trean/lib/Data/Json.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

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

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

commit 4f41be649aa39f39194f4d5a62a36810af7641f3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:35:05 2013 -0400

    There is no "next" step, name this accordingly.

 trean/templates/data/import.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/4f41be649aa39f39194f4d5a62a36810af7641f3