[commits] Horde branch develop updated. 352029e6c7d9fc4f86d165a60d0030698662eac8

[Michael M Slusarz]

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

from: c5eab081909effa8b6fdbb11e38da54cfc055eab

2fcd069 [jan] Fix class name (software-horde at interfasys.ch, Bug #11164).
b974440 Update fr translation.
aade35c [jan] Update ISO list of countries (Bug #11169).
8296431 [jan] Update Lybian flag (Request #11169).
73bbad2 Issue NOOP only after we finish parsing a command
05ff35b Add spacing between login auto-determine mode and the actual modes themselves
352029e Merge branch 'master' into develop

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

commit 2fcd069e34d6934539eddb827f4fff3c4048e7e3
Author: Jan Schneider <jan at horde.org>
Date:   Fri Apr 27 10:28:21 2012 +0200

    [jan] Fix class name (software-horde at interfasys.ch, Bug #11164).

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php |    2 +-
 framework/ActiveSync/package.xml                                |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

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

commit b9744400f401420c60718551a87fc601d2e73405
Author: Jan Schneider <jan at horde.org>
Date:   Fri Apr 27 10:40:09 2012 +0200

    Update fr translation.

 imp/locale/fr/LC_MESSAGES/imp.mo |  Bin 194107 -> 194112 bytes
 imp/locale/fr/LC_MESSAGES/imp.po |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit aade35c55ff12923224ace0af0385a8a49cc9955
Author: Jan Schneider <jan at horde.org>
Date:   Mon Apr 30 19:47:02 2012 +0200

    [jan] Update ISO list of countries (Bug #11169).

 framework/Nls/lib/Horde/Nls/Countries.php |   24 +++++++++++++++++-------
 framework/Nls/package.xml                 |    4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

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

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

commit 829643129b57db44f88107310ad47efdc5ebee74
Author: Jan Schneider <jan at horde.org>
Date:   Mon Apr 30 19:50:54 2012 +0200

    [jan] Update Lybian flag (Request #11169).

 horde/docs/CHANGES                         |    1 +
 horde/package.xml                          |    2 ++
 horde/themes/default/graphics/flags/ly.png |  Bin 330 -> 465 bytes
 3 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/829643129b57db44f88107310ad47efdc5ebee74

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

commit 73bbad254531d61318aaef709d1db2cc6b610142
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 30 23:36:04 2012 -0600

    Issue NOOP only after we finish parsing a command

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/73bbad254531d61318aaef709d1db2cc6b610142

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

commit 05ff35b997bbbb3b900edf8a1f4e7dc308e0b09e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 30 23:59:35 2012 -0600

    Add spacing between login auto-determine mode and the actual modes themselves

 horde/login.php                       |    1 +
 horde/templates/login/login.inc       |    4 ++++
 horde/templates/login/smartmobile.inc |    6 +++++-
 3 files changed, 10 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/05ff35b997bbbb3b900edf8a1f4e7dc308e0b09e

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

commit 352029e6c7d9fc4f86d165a60d0030698662eac8
Merge: 05ff35b 73bbad2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue May 1 00:01:01 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/ActiveSync/package.xml
    	horde/package.xml

 framework/ActiveSync/package.xml                       |    4 ++
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |   13 ++++----
 framework/Nls/lib/Horde/Nls/Countries.php              |   24 +++++++++++----
 framework/Nls/package.xml                              |    4 +-
 horde/docs/CHANGES                                     |    1 +
 horde/package.xml                                      |    1 +
 horde/themes/default/graphics/flags/ly.png             |  Bin 330 -> 465 bytes
 imp/locale/fr/LC_MESSAGES/imp.mo                       |  Bin 194107 -> 194112 bytes
 imp/locale/fr/LC_MESSAGES/imp.po                       |    2 +-
 9 files changed, 33 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/352029e6c7d9fc4f86d165a60d0030698662eac8