[Pkg-owncloud-commits] [php-sabre-vobject] 113/128: Merge branch 'vtimezone'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 6fc58c9d25a04f7497ba219e5625130c8d298cc7
Merge: f308271 6e1adc4
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Apr 30 14:37:13 2014 -0400

    Merge branch 'vtimezone'
    
    Conflicts:
    	bin/fetch_windows_zones.php
    	lib/Sabre/VObject/timezonedata/windowszones.php

 .travis.yml                                        | 4 +---
 bin/{fetch_tz_data.php => fetch_windows_zones.php} | 0
 lib/Sabre/VObject/timezonedata/windowszones.php    | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git