[commits] Horde branch master updated. 5c2832bffdc2e29ddf146da99498fdcb54dabb06

[Michael J. Rubinsky]

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

from: 068757da79b7992a176a4fe2aff31acd057a515a

56bda37 Revert "parse error."
5c2832b Revert "Skip the tag migrations if the Content migration has not been run."

Summary: http://github.com/horde/horde/compare/068757da79b7992a176a4fe2aff31acd057a515a...5c2832bffdc2e29ddf146da99498fdcb54dabb06

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

commit 56bda3728b0f65865079d71822829c2b4f2a27e3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Mar 25 14:15:42 2014 -0400

    Revert "parse error."
    
    This reverts commit 068757da79b7992a176a4fe2aff31acd057a515a.

 nag/migration/10_nag_upgrade_categoriestotags.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/56bda3728b0f65865079d71822829c2b4f2a27e3

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

commit 5c2832bffdc2e29ddf146da99498fdcb54dabb06
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Mar 25 14:15:57 2014 -0400

    Revert "Skip the tag migrations if the Content migration has not been run."
    
    This reverts commit 08f604012bf1c8094bc88cea655bdc460d62ccfb.
    
    Doh. This obviously is incorrect, as it assumes a SQL backend for the
    Content system and needs knowledge of the inner workings of it.

 ansel/migration/4_ansel_upgrade_tagstocontent.php             |    8 ---
 ansel/migration/5_ansel_upgrade_categoriestotags.php          |    8 ---
 kronolith/migration/18_kronolith_upgrade_categoriestotags.php |   18 +-------
 mnemo/migration/6_mnemo_upgrade_categoriestotags.php          |   19 +-------
 nag/migration/10_nag_upgrade_categoriestotags.php             |   19 +-------
 turba/migration/10_turba_upgrade_categoriestotags.php         |   20 +-------
 6 files changed, 11 insertions(+), 81 deletions(-)

http://github.com/horde/horde/commit/5c2832bffdc2e29ddf146da99498fdcb54dabb06