[Pkg-owncloud-commits] [php-sabre-vobject] 36/341: Merge branch '3.3'

[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 9b464c7a1b92900917a7ccbab9654ff887482cec
Merge: 46f78ab 726e9d8
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Dec 3 01:02:54 2014 -0500

    Merge branch '3.3'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md                                   |   3 +-
 lib/Cli.php                                    |   2 +-
 lib/Component/VTimeZone.php                    |  14 +++
 lib/ITip/Broker.php                            |   4 +
 tests/VObject/Component/VTimeZoneTest.php      |  25 ++++-
 tests/VObject/ITip/BrokerAttendeeReplyTest.php | 145 +++++++++++++++++++++++++
 tests/VObject/Parser/MimeDirTest.php           |  21 ++++
 7 files changed, 211 insertions(+), 3 deletions(-)

diff --cc ChangeLog.md
index db4afb9,6dcc337..7cb6314
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,19 -1,7 +1,19 @@@
  ChangeLog
  =========
  
 +4.0.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.5.
 +* #139: We now accept `DateTimeInterface` whereever it accepted `DateTime`
 +   before in arguments. This means that either `DateTime` or
 +  `DateTimeImmutable` may be used everywhere.
 +* #139: We now _always_ return `DateTimeImmutable` from any method. This could
 +  potentially have big implications if you manipulate Date objects anywhere.
 +* #161: Simplified `ElementList` by extending `ArrayIterator`.
 +
 +
- 3.3.4 (2014-??-??)
+ 3.3.4 (2014-11-19)
  ------------------
  
  * #154: Converting `ANNIVERSARY` to `X-ANNIVERSARY` and `X-ABDATE` and

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