[commits] Horde branch master updated. 206400371c4815e81b12e93ac5bfc099658acba9

[Jan Schneider]

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

from: ea011b0e858b877e74fca5d9f8bea8133072ee8a

bdd86dc Remove conflict marker.
7fc26b3 Fix package names.
2064003 Trusty doesn't work.

Summary: http://github.com/horde/horde/compare/ea011b0e858b877e74fca5d9f8bea8133072ee8a...206400371c4815e81b12e93ac5bfc099658acba9

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

commit bdd86dcd43cdbe00fa4b89d014533d89d929adfa
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 6 12:53:04 2017 +0200

    Remove conflict marker.

 wicked/docs/CHANGES | 1 -
 1 file changed, 1 deletion(-)

http://github.com/horde/horde/commit/bdd86dcd43cdbe00fa4b89d014533d89d929adfa

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

commit 7fc26b32445aca79c48cf91077a628b0c29161ec
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 6 12:53:42 2017 +0200

    Fix package names.

 timeobjects/lib/Factory/Driver.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/7fc26b32445aca79c48cf91077a628b0c29161ec

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

commit 206400371c4815e81b12e93ac5bfc099658acba9
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 6 14:12:40 2017 +0200

    Trusty doesn't work.
    
    Trusty builds don't work due to travis-ci/travis-ci#7067 still not being fixed.

 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

http://github.com/horde/horde/commit/206400371c4815e81b12e93ac5bfc099658acba9