[php-sabredav-Sabre_CardDAV/f20: 2/2] Merge branch 'master' into f20

[Joseph Marrero]

commit 65c24ee383a59e333873879fc3d591ce2edcbf86
Merge: e1a3cf3 62dbfee
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Thu Sep 5 13:22:54 2013 -0400

    Merge branch 'master' into f20

 php-sabredav-Sabre_CardDAV.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---