Merge remote-tracking branch 'upstream/staging' into staging
Merge branch 'master' of https://github.com/joomla/joomla-platform into JLoggerCallback
Merge branch 'staging' of https://github.com/joomla/joomla-platform into staging
Merge branch 'staging' into JLoggerCallback
Just execute the callback. Ignore return values. Callback is not required to return 'true'
Throw an exception if there is not a valid callback.
Tests for JLoggerCallback
Allow additional characters in JFolder names: ()[]{}#$^+.'~`!@&=;,
Disallow : in JFolder names
http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
Cause stream.php to actually iterate along the string rather than repeating the beginning.
Avoid modifying pass-by-reference string in stream.php.
Cause stream.php to actually iterate along the string rather than repeating the beginning.
Avoid modifying pass-by-reference string in stream.php.
Merge branch 'stream' of github.com:aaronschmitz/joomla-platform into stream
Add new params to media field: preview_width / preview_height
(Allowing full-size preview)
fix phpcs
Merge branch 'staging' of https://github.com/joomla/joomla-platform into foldernames
Merge branch 'staging' of https://github.com/joomla/joomla-platform into stream

Conflicts:
	libraries/joomla/filesystem/stream.php
Updated database session code to avoid duplication of session id
Database changes for codestyle
Since the WebKit bug (https://bugs.webkit.org/show_bug.cgi?id=38690) has been fixed over a year ago we can remove the workaround.