Merge branch 'xdebug_2_2'
Back to dev on the new 2.3 branch.
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Fixed bug #834: Regenerate example xdebug.ini.
Merge branch 'issue811-php-documentation-link'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Merge branch 'xdebug_2_2'
Fixed test case.
Added a new test case.
Added some more files to the ignore list.
Merge branch 'xdebug_2_2'

Conflicts:
	xdebug.ini