[commits] Horde branch imp_6_1 updated. dc5f2f9cfda9ae3662cf9acd19a3ca3ff0a91281

[Michael M Slusarz]

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

from: b81e0243edf431be45184083ed07bdddfd24229c

35ec5d6 Add unit test
59a091e phpdoc
47e0214 Coding style
90c805e Fix undefined variable
dc5f2f9 Merge branch 'master' into imp_6_1

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

commit 35ec5d6f791279efee7ce9996ecc8f33dc0c636e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 00:25:41 2013 -0600

    Add unit test

 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/35ec5d6f791279efee7ce9996ecc8f33dc0c636e

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

commit 59a091e3f67f1982970e4b03c68d3ca1487edcc1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 01:11:03 2013 -0600

    phpdoc

 .../Cache/migration/Horde/Cache/1_horde_cache_base_tables.php     |    5 +++++
 framework/Util/test/Horde/Util/UtilTest.php                       |    3 +++
 horde/lib/Application.php                                         |    5 ++++-
 horde/lib/View/Sidebar.php                                        |    2 +-
 horde/lib/View/Topbar.php                                         |    2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/59a091e3f67f1982970e4b03c68d3ca1487edcc1

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

commit 47e0214d2304ecd0f643dd0a975efe74cbbaeaf3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 02:37:14 2013 -0600

    Coding style

 framework/Imap_Client/lib/Horde/Imap/Client/Base.php |    6 +++---
 framework/Imap_Client/lib/Horde/Imap/Client/Url.php  |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/47e0214d2304ecd0f643dd0a975efe74cbbaeaf3

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

commit 90c805ee7f467e7a3fd7e3f449f44fbc03495c40
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 15:18:36 2013 -0600

    Fix undefined variable

 imp/lib/Compose.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/90c805ee7f467e7a3fd7e3f449f44fbc03495c40

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

commit dc5f2f9cfda9ae3662cf9acd19a3ca3ff0a91281
Merge: b81e024 90c805e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 17:28:32 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Compose.php

 .../Cache/migration/Horde/Cache/1_horde_cache_base_tables.php     |    5 ++
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Url.php               |    1 -
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |   10 +++++
 framework/Util/test/Horde/Util/UtilTest.php                       |    3 +
 horde/lib/Application.php                                         |    5 ++-
 horde/lib/View/Sidebar.php                                        |    2 +-
 horde/lib/View/Topbar.php                                         |    2 +-
 8 files changed, 27 insertions(+), 7 deletions(-)

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