[commits] Horde branch master updated. 7f17accef6adcb88f0e39cc373ffe55c096302a0

[Jan Schneider]

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

from: cc599dfe1e03f41af2b05a39fd011bbcbb0fba4f

7f17acc [jan] Fix vCard MIME viewer.

Summary: http://github.com/horde/horde/compare/cc599dfe1e03f41af2b05a39fd011bbcbb0fba4f...7f17accef6adcb88f0e39cc373ffe55c096302a0

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

commit 7f17accef6adcb88f0e39cc373ffe55c096302a0
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 19 23:44:33 2014 +0200

    [jan] Fix vCard MIME viewer.
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Mime/Viewer/Vcard.php
    	imp/package.xml

 imp/docs/CHANGES              |    1 +
 imp/lib/Mime/Viewer/Vcard.php |    2 +-
 imp/package.xml               |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

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