[Pkg-owncloud-commits] [php-sabre-vobject] 26/341: Merge pull request #162 from Hywan/code_review

[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 2a3054606b89b2c216a38b1c2c4fe15144d8bf30
Merge: 7e32c92 59b3178
Author: Evert Pot <me at evertpot.com>
Date:   Thu Nov 13 12:48:01 2014 -0500

    Merge pull request #162 from Hywan/code_review
    
    Code review

 bin/generate_vcards                  |   4 +-
 bin/vobject                          |   4 +-
 lib/Cli.php                          |   2 +-
 lib/ITip/Broker.php                  | 122 +++++++++++++--------------
 lib/Parameter.php                    |   4 +-
 lib/Parser/Json.php                  |  14 ++--
 lib/Parser/MimeDir.php               |  26 +++---
 lib/Parser/Parser.php                |   2 +-
 lib/Property/Binary.php              |   2 +-
 lib/Property/Float.php               |  14 +---
 lib/Property/Integer.php             |   2 +-
 lib/Property/Text.php                |  25 +++---
 lib/Property/VCard/DateAndOrTime.php |   4 +-
 lib/Reader.php                       |   2 +-
 lib/timezonedata/exchangezones.php   | 158 +++++++++++++++++------------------
 lib/timezonedata/lotuszones.php      |   4 +-
 lib/timezonedata/php-bc.php          |   4 +-
 lib/timezonedata/php-workaround.php  |   4 +-
 18 files changed, 194 insertions(+), 203 deletions(-)

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