[commits] Horde branch imp_6_1 updated. 6f29e874df412f77778334ad3967cbb3f664c814

[Michael M Slusarz]

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

from: 651f77cbc738557d4c09d66d8a2e9b12155cf164

256dd64 phpdoc
2a6c48e Fix broken ensureTags test
5dc894b Add test for ensureTypes
325718d Ensure the type_ids are cast to integer.
dea61b0 If not using qreply, this code will never berun
6f29e87 Merge branch 'master' into imp_6_1

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

commit 256dd64f88c240e3ae0025dce4a72ce0c0909e8b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Feb 6 13:46:56 2013 -0500

    phpdoc

 content/lib/Tagger.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/256dd64f88c240e3ae0025dce4a72ce0c0909e8b

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

commit 2a6c48ea338af27ed796c5a6a60d0494927a2241
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Feb 6 13:47:14 2013 -0500

    Fix broken ensureTags test

 content/test/Content/Base.php |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

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

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

commit 5dc894ba5079dd3d4156aa618acc69f237b36da0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Feb 6 15:52:07 2013 -0500

    Add test for ensureTypes

 content/test/Content/Base.php     |   12 ++++++++++++
 content/test/Content/Sql/Base.php |    6 ++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

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

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

commit 325718d8def0b481eeb10495b09d8637ec312347
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Feb 6 15:55:55 2013 -0500

    Ensure the type_ids are cast to integer.

 content/lib/Types/Manager.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/325718d8def0b481eeb10495b09d8637ec312347

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

commit dea61b06794fb16ebf17e66c6c7811c831b0bba6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 14:52:46 2013 -0700

    If not using qreply, this code will never berun

 imp/js/compose-dimp.js |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

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

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

commit 6f29e874df412f77778334ad3967cbb3f664c814
Merge: 651f77c dea61b0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 14:53:22 2013 -0700

    Merge branch 'master' into imp_6_1

 content/lib/Tagger.php            |    4 ++--
 content/lib/Types/Manager.php     |    4 ++--
 content/test/Content/Base.php     |   30 +++++++++++++++++++++---------
 content/test/Content/Sql/Base.php |    6 ++++++
 imp/js/compose-dimp.js            |    6 ++++--
 5 files changed, 35 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/6f29e874df412f77778334ad3967cbb3f664c814