Fixing typo in example file


	See: cakephp/cakephp@f358a6d51d56d2ffaa261b7aad52fd5d1fb71408
Merge remote-tracking branch 'tigrang/3.0-query' into 3.0-database

Conflicts:
	App/Config/bootstrap.php
	lib/Cake/Model/Datasource/Database/Query.php
	lib/Cake/Test/TestCase/Model/Datasource/Database/ConnectionTest.php
	lib/Cake/Test/TestCase/Model/Datasource/Database/QueryTest.php


	See: cakephp/cakephp@a031120d408c44411f139c12f3b4fb7845007afd
Removed spaces at the end of lines.


	See: cakephp/cakephp@41ae19b5bcf40f5dd00a536bb5c54f41882ee9c9
Merge pull request #901 from markstory/3.0-merge-vars

3.0 merge vars

	See: cakephp/cakephp@94131c6616ca9b050bef02958e865ecd94112a32
Remove trailing whitespace from comments

See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion


	See: cakephp/cakephp@4090c2e9323e5e3d2112ee7f2f831bd5e5d292a4
Merge pull request #904 from ataylor32/remove-trailing-whitespace

Remove trailing whitespace from comments

	See: cakephp/cakephp@805b44f17cee1f685ffe22c8297a25e7b71a4d86
Merge remote-tracking branch 'cakephp/2.3' into 3.0

Conflicts:
	App/Config/bootstrap.php
	App/Config/routes.php
	app/Config/core.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Network/Request.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/TestCase/Event/EventManagerTest.php
	lib/Cake/Test/TestCase/Model/Behavior/TreeBehaviorUuidTest.php


	See: cakephp/cakephp@d82eea8e0fa44dfc1e014d157544b662da2a0a8b
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php


	See: cakephp/cakephp@1aea9ac0c958a65f6c4fbb5c3bcfa0894a22b7c3
Merge branch 'master' into 2.3


	See: cakephp/cakephp@1cc82ff39ffb37820da8c0cd6ae356666e780776
Merge pull request #906 from markstory/3.0-asset-filter

Remove support for asset filters.

Fixes #3279

	See: cakephp/cakephp@4ded3b86dac9b23083af09b338e6c5e1fea3756e
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php


	See: cakephp/cakephp@0b0b361e481ccb89098943bebc5eb096334c0962
Merge pull request #905 from dereuromark/2.3-ini

allow ini files to have separators between sections for better readability

	See: cakephp/cakephp@d75bd48c25e3671d72a799282e8b37a330107c23
Merge pull request #894 from dereuromark/comp-fix-save-all

BC mod for saveAll()

	See: cakephp/cakephp@746eaf938918ffc0af60ec2765851403c54781be
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/bootstrap.php


	See: cakephp/cakephp@1763f463406a52fe3d3a09b1bc4fb0fd6f23b005
Merge branch 'master' into 2.3


	See: cakephp/cakephp@d2010308d44140670178d342597da91b145604b8
Merge branch '2.3' into type-checks

Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php


	See: cakephp/cakephp@641ba9f3e61cb33c21068b435136edc8a0379233
Merge pull request #911 from dogmatic69/type-checks

Type checks

	See: cakephp/cakephp@2841611c0fc4815882a616f1723520d0df4c3764
Merge pull request #909 from dereuromark/master-magic-input-bc

Master magic input bc

Fixes #3295

	See: cakephp/cakephp@555bfc32ea286262dd78eace5fb1dd68b9e25c7f
Make app/Console/cake pwd insensitive on Mac OS X.
Follow up of [36e15a065b2a1b9fe93e22e62a9802d6e88a7004].


	See: cakephp/cakephp@02cfacec4174d5e4467c5436de6193448b741866
Merge pull request #914 from dereuromark/2.3-i18n-extract

Normalize paths in generate pot files to always use /

Fixes #3306

	See: cakephp/cakephp@d051b6931212061965684d7a0da222fa52c82ef4