Merge branch 'master' into extra, bumped version to 1.2.5.

Conflicts:
	PHP Markdown Extra Readme.text
	markdown.php

Updated to version number 1.0.1o.

Updated version number to 1.2.4.

Fixed some emphasis corner-cases.

Updated version numbers for Extra 1.2.3

Merge branch 'master' into extra

Fixed a bug introduced while moving code to prepareItalicsAndBold.

Updated Extra's version number to 1.2.1.

Merge branch 'master' into extra

Conflicts:

	License.text

Updated copyright year in license file.