Update default.php
Merge pull request #34 from joomla/master

Sync Master with Joomla's
Update cacert.pem to latest version
Merge pull request #4125 from zero-24/patch-3

[#34077] Problem if feed contains only a few entries
[CS] Code Style fixes. Closes #4277, closes #4304, closes #4305
[CS] CodeStyle on joomla.sql. Closes #4298
Merge pull request #4296 from nicksavov/update-cacert-pem

Update cacert.pem to latest version
Prepare 3.3.4 release
Reset for development
Merge branch 'staging' into 3.4-dev
Merge remote-tracking branch 'joomla/3.4-dev' into weblinksRemoval

Conflicts:
	components/com_weblinks/weblinks.php
	installation/sql/mysql/joomla.sql