Regression in Filesystem Platform 13.1 upgrade
Merge pull request #1876 from wilsonge/patch-5

Regression in Filesystem Platform 13.1 upgrade
Fix Regression in FileSystem Platform 13.1 upgrade
Merge pull request #1877 from wilsonge/patch-5

Fix Regression in FileSystem Platform 13.1 upgrade
Smallest Doc block update ever :)
Merge pull request #1878 from wilsonge/patch-5

Smallest Doc block update ever :)
Fix problem with renamed test method.
Fix failing system test due to new option in Global Configuration.
 + [#30944] Content versioning for core and third-party components.
Thanks Mark Dexter
Fix code-style issues from [#30944] Content versioning. Thanks George
Wilson.
Add Ant target to run phpDocumentor
Fix line breaks in 3.2.0.sql
Fix typo

Simple edit to fix a typo
 $ Adding Tamil to tinymce lang files
Merge pull request #1899 from brianteeman/patch-15

Fix typo
Merge remote-tracking branch joomla/joomla-cms 'origin/master' into jux-rebased after joomla-cms/master had Content Versioning added

Conflicts:
	administrator/components/com_categories/models/forms/category.xml
	administrator/components/com_categories/views/category/tmpl/edit.php
	administrator/components/com_categories/views/category/view.html.php
	administrator/components/com_contact/views/contact/view.html.php
	administrator/components/com_content/models/forms/article.xml
	administrator/components/com_content/views/article/view.html.php
	administrator/components/com_newsfeeds/views/newsfeed/view.html.php
	administrator/components/com_weblinks/views/weblink/view.html.php
	administrator/language/en-GB/en-GB.ini
	layouts/joomla/edit/details.php
Added the version_note to the new layouts/joomla/edit/main.php from jux-rebased
Fixed the size alignment of the Version Notes input box
Merge pull request #164 from beat/jux-rebased-merge-contenthistory

After successful tests:
Merge joomla/joomla-cms/master (with Content Versioning) into joomla-projects/joomla-cms/jux-rebased so that the jux-rebased is mergeable again with joomla/master