[commits] Horde branch master updated. cc599dfe1e03f41af2b05a39fd011bbcbb0fba4f

[Jan Schneider]

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

from: 0f05d4a913f9e7de46840e17f9ea8cc864a8bc2f

ce66286 Load mime.css.
ce0ea0c [jan] Fix iTip MIME viewer actions in basic view (Bug #12677).
cc599df This affects other mime viewers too.

Summary: http://github.com/horde/horde/compare/0f05d4a913f9e7de46840e17f9ea8cc864a8bc2f...cc599dfe1e03f41af2b05a39fd011bbcbb0fba4f

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

commit ce662862e705080ab1cfb25acfe4c70de965e515
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 19 23:16:28 2014 +0200

    Load mime.css.

 imp/lib/Mime/Viewer/Itip.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

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

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

commit ce0ea0cee123b7ccacfcd29c41fad5ca37d45ad6
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 19 22:57:05 2014 +0200

    [jan] Fix iTip MIME viewer actions in basic view (Bug #12677).
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 imp/docs/CHANGES |    1 +
 imp/package.xml  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

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

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

commit cc599dfe1e03f41af2b05a39fd011bbcbb0fba4f
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 19 23:32:43 2014 +0200

    This affects other mime viewers too.
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 imp/docs/CHANGES |    2 +-
 imp/package.xml  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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