Merge remote-tracking branch 'nextghost/master'

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.
Remove closing PHP tag in stalecheck test case
Merge remote-tracking branch 'origin/master'
Persian translation
danish language update
no longer allow include statements in local.conf.php

as discussed at https://github.com/splitbrain/dokuwiki/pull/115
renamed conf_path() to farm_confpath()
Prevent information disclosure in farms by disallowing subdirectories
Merge pull request #117 from splitbrain/farms

added farms to the core
added lang string for 'Sidebar'
Merge branch 'ldap_multi_server' of git://github.com/DvaSlona/dokuwiki into pull-request-104

* 'ldap_multi_server' of git://github.com/DvaSlona/dokuwiki:
  Config method changed from array to comma separated string.
  Allow multiple LDAP servers.
supress errors from LDAP bind
Fix HTML injection in mediaFileList (Secunia advisory SA49196)
Release preparations
changed the link in the installer to point to wiki:welcome
added welcome page
changed all doctypes to html5 doctype
fixed validation errors in the installer
exchanged named entities with unicode characters in French lang file
improved welcome text