[Pkg-owncloud-commits] [php-sabre-vobject] 19/43: Merge branch 'master' of github.com:fruux/sabre-vobject

[David Prévot]

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

taffit pushed a commit to tag 4.0.0-alpha2
in repository php-sabre-vobject.

commit 402e62af243d26bcb3f11b72299881efb7ecdd7e
Merge: a738153 87c6a50
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jul 27 16:57:53 2015 -0400

    Merge branch 'master' of github.com:fruux/sabre-vobject

 CHANGELOG.md                                    |   1 +
 lib/BirthdayCalendarGenerator.php               | 179 +++++++++
 tests/VObject/BirthdayCalendarGeneratorTest.php | 481 ++++++++++++++++++++++++
 3 files changed, 661 insertions(+)

diff --cc CHANGELOG.md
index 2fc7ffa,47dbb67..6179d45
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -4,9 -4,8 +4,10 @@@ ChangeLo
  4.0.0-alpha2 (2015-??-??)
  -------------------------
  
 +* Updated windows timezone file to support new mexican timezone.
+ * #239: Added a `BirthdayCalendarGenerator`. (@DominikTo)
  
 +
  4.0.0-alpha1 (2015-07-17)
  -------------------------
  

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