[commits] Horde branch master updated. f283c1a7a0ae5d53f1b2b0a49c3b7bdbcec289d3

[Jan Schneider]

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

from: 5288a6314c8e25b63103e9943289a35587ebae48

f283c1a [jan] Don't try to load Content application if tags are disabled.

Summary: http://github.com/horde/horde/compare/5288a6314c8e25b63103e9943289a35587ebae48...f283c1a7a0ae5d53f1b2b0a49c3b7bdbcec289d3

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

commit f283c1a7a0ae5d53f1b2b0a49c3b7bdbcec289d3
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 20 15:02:32 2015 +0100

    [jan] Don't try to load Content application if tags are disabled.
    
    Conflicts:
    	turba/docs/CHANGES
    	turba/package.xml

 turba/docs/CHANGES        |    2 ++
 turba/lib/Application.php |   20 +++++++++++---------
 turba/package.xml         |    1 +
 3 files changed, 14 insertions(+), 9 deletions(-)

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