[php-sabredav-Sabre_VObject/el6] (3 commits) ...conditionalize the pear_metadir definition for merging to master

[Adam Williamson]

Summary of changes:

  e95a815... new release 2.1.7 (*)
  d7b8aa4... Merge branch 'master' into el6: new release 2.1.7 (*)
  30f14de... conditionalize the pear_metadir definition for merging to m (*)

(*) This commit already existed in another branch; no separate mail sent