From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 26 Aug 2014 09:39:17 +0000 (+0200)
Subject: Merge commit '75245bbc807b67247234c9103b162008c5b5b326' into cweiske
X-Git-Tag: 0.8.0~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80bfe0c989b5884d0133e99c36ccad7197105593;p=contagged

Merge commit '75245bbc807b67247234c9103b162008c5b5b326' into cweiske

* commit '75245bbc807b67247234c9103b162008c5b5b326':
  allow custom field definitions in config.php
  fix broken evolutionPerson fields (country not provided, but anniversary and categories exist)
  make object classes configurable in inc/config.php
  Fix issue #10: vcards need CRLF and newline at the end
  fix broken tags.php
  make categories work with evolutionPerson schema
  nicer error display
  tell where the error happened
  search address book subtree, not only one level
  ignore cache files
  move config.php to config.php.dist, ignore user config
---

80bfe0c989b5884d0133e99c36ccad7197105593