# [#30349] Cleaned up use of database & query objects. Thanks Peter van
Westen and Michael Babker
(Fix #856)
Merge branch 'master' of https://github.com/joomla/joomla-cms into davidsbranch

Conflicts:
	libraries/cms/tags/tags.php
work in progress