[Pkg-owncloud-commits] [php-sabredav] 85/163: Merge branch '1.7' into 1.8

[David Prévot]

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

taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit 943ba2a43cfdde88200664cd72216982fc7b433d
Merge: bdc918e 2f69947
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Apr 21 01:04:31 2014 -0400

    Merge branch '1.7' into 1.8

 docs/caldav-ctag.txt                              |   336 -
 docs/caldav-notifications.txt                     |  1568 ---
 docs/caldav-proxy.txt                             |   560 -
 docs/caldav-sharing.txt                           |  1624 ---
 docs/draft-daboo-carddav-directory-gateway-02.txt |   560 -
 docs/draft-desruisseaux-caldav-sched-10.txt       |  5544 --------
 docs/draft-ietf-httpbis-p1-messaging-11.txt       |  5152 --------
 docs/draft-ietf-httpbis-p4-conditional-11.txt     |  1512 ---
 docs/draft-ietf-httpbis-p5-range-11.txt           |  1512 ---
 docs/draft-ietf-httpbis-p6-cache-11.txt           |  2352 ----
 docs/draft-nottingham-http-new-status-04.txt      |   560 -
 docs/rfc2425.txt                                  |  1851 ---
 docs/rfc2426.txt                                  |  2355 ----
 docs/rfc2518.txt                                  |  5267 --------
 docs/rfc2616.txt                                  |  9859 --------------
 docs/rfc2617.txt                                  |  1907 ---
 docs/rfc3253.pdf                                  | 10329 ---------------
 docs/rfc3744.pdf                                  |  6295 ---------
 docs/rfc4437.pdf                                  |  3127 -----
 docs/rfc4790.txt                                  |  1459 ---
 docs/rfc4791.txt                                  |  5995 ---------
 docs/rfc4918.pdf                                  | 13609 --------------------
 docs/rfc5051.txt                                  |   395 -
 docs/rfc5397.txt                                  |   281 -
 docs/rfc5545.txt                                  |  9411 --------------
 docs/rfc5546.txt                                  |  7451 -----------
 docs/rfc5689.txt                                  |   675 -
 docs/rfc5785.txt                                  |   451 -
 docs/rfc5789.txt                                  |   563 -
 docs/rfc6047.txt                                  |  1235 --
 docs/rfc6321.txt                                  |  3027 -----
 docs/rfc6350.txt                                  |  4147 ------
 docs/rfc6351.txt                                  |  1235 --
 docs/rfc6352.txt                                  |  2691 ----
 34 files changed, 114895 deletions(-)

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