* 'ldap_multi_server' of git://github.com/DvaSlona/dokuwiki:
  Config method changed from array to comma separated string.
  Allow multiple LDAP servers.

added farms to the core

as discussed at https://github.com/splitbrain/dokuwiki/pull/115

This changes the caching system to expire caches when the last modified time of
a dependency is equal to the cache file except for the meta file where the old
check is kept in order to avoid additional renderer calls and possible circular
dependencies. This avoids stale cache files but means that the parser and
renderer could now be called more than once after an edit but we currently
don't have a better fix for that.

consider empty files as no file in installer

This makes sure that the animal that is specified in the URL is actually
a subdirectory inside the farm and not somewhere else in the system.
This allows that the animals are organized in different subdirectories
for more complicated farm setups.

Now the animal can be specified in the animal environment variable.

* extracted most farm code into inc/farm.php
* by default farm.php is nowhere included
* added preload.php.dist as an example farm setup
* farm.php can be included in preload.php to activate farming

allow empty config file to proceed installation as we package default
config empty in first install

as packager may provide empty file in package, to ensure correct
file permissions.

import old patch:
http://cvs.pld-linux.org/packages/dokuwiki/install.patch

I hate using heights, but couldn't find any other way

same problem as in f1d7655b

string sanitization even for their own new actions

The used syntax was invalid in PHP < 3.4 and seemed to be wrong logical
as well.

* 'input-validation' of git://github.com/whoopdedo/dokuwiki:
  fix incorrect usage of tpl_getMediaFile
  fix necessary global declaration
  Input wrapper for html forms
  Input validation for media manager
  Input wrapper for exe scripts
  more INPUT wrapper uses: cache purge, sectok, getID
  Input wrapper for action.php

Conflicts:
	lib/exe/css.php

de/de-informal: added missing strings / updates for existing ones.

BG: language update

* 'httpclient' of git://github.com/whoopdedo/dokuwiki:
  Adjust unit test to reflect desired behavior of max_bodysize
  Avoid timeout when content-length is 0
  Limit size of reads when max_bodysize is set or content-length is present
  Skip over chunk extensions that nobody uses because RFC2616 says so
  HTTPClient will read up to max_bodysize if it can
  Validate the size of a chunk before reading from the socket
  Efficiently wait on sockets
  HTTP headers are already parsed, there is no need for regexp
  Utility function for writing to a socket
  Unit test for HTTPClient chunked encoding
  Utility functions for reading from a socket.
  Raise an exception on socket errors.
  Correct handling of chunked transfer encoding. (FS#2535)
  Avoid strict warnings about unset array keys.
  Reference static variable through 'self::' as you're supposed to.