Merge branch 'master' of git://github.com/borekb/dokuwiki into pull-request-84

* 'master' of git://github.com/borekb/dokuwiki:
  Colon is no longer rewritten to semicolon for IIS 7.x and for older versions of IIS, semicolon is displayed as is, not URL-encoded.

Conflicts:
	inc/common.php