[commits] Horde branch develop updated. 52b9490654567ea64abacc52db19dd2c10c5253b

[Michael J. Rubinsky]

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

from: 6f85868cca80c895880586bd45084ab7fa33e908

c9f92aa Fix viral typo
a5465fb Get caught up on some BFN
c226297 Tags are added in Kronolith::addShare(), plus $result->calendar isn't set at this point anyway.
17f7ffc Tags are updated in Kronolith::updateShare also. No longer need $tagger here.
52b9490 Merge branch 'master' into develop

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

commit c9f92aae1d29af0ec19cea7b2c50fe620ee85226
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Jan 25 13:12:05 2012 -0500

    Fix viral typo

 kronolith/resources/groups/delete.php |    2 +-
 kronolith/resources/groups/edit.php   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit a5465fb1c8cbdf79919baadbe9629cc801c5d1f5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Jan 26 10:44:29 2012 -0500

    Get caught up on some BFN

 framework/ActiveSync/package.xml |    4 ++--
 framework/Core/package.xml       |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

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

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

commit c226297b015519d845f95929051e04b799f92ccb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Jan 26 11:33:55 2012 -0500

    Tags are added in Kronolith::addShare(), plus $result->calendar isn't set at this point anyway.

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

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

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

commit 17f7ffc9fd13c866d73e9ab882a770b9aca81122
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Jan 26 11:36:32 2012 -0500

    Tags are updated in Kronolith::updateShare also. No longer need $tagger here.

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

http://git.horde.org/horde-git/-/commit/17f7ffc9fd13c866d73e9ab882a770b9aca81122

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

commit 52b9490654567ea64abacc52db19dd2c10c5253b
Merge: 6f85868 17f7ffc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Jan 26 12:40:49 2012 -0500

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

 framework/ActiveSync/package.xml   |    4 ++--
 framework/Core/package.xml         |    1 +
 kronolith/lib/Ajax/Application.php |    3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/52b9490654567ea64abacc52db19dd2c10c5253b