Fixing https://github.com/CakeDC/tags/issues/11 by adding recursive = 0 to the _findTagged query options and adding an informative exception when recursive is set to -1 by the developer.
Fixing the migration map
Fix typo in tagged model.
Merge pull request #29 from neterslandreau/master

Add missing semi-colon
Move tests to a 2.x folder structure
Test case clean up for 2.x
Use CakeException to allow disabling

Prevent expectException() exception as you cant expect the generic exception class
Merge pull request #31 from shama/patch-1

Upgrade Test Cases for 2.x
Fixed various issues with PHP 5.4 compatibility regarding method signatures
Merge pull request #32 from josegonzalez/2.0

Fixed various issues with PHP 5.4 compatibility regarding method signatures
Updating copyright year
Adding tests for https://github.com/CakeDC/tags/issues/15
Adding tests for https://github.com/CakeDC/tags/issues/15, backporting this to 1.3
Merge branch 'develop' of github.com:CakeDC/tags into develop

Conflicts:
	tests/cases/models/tagged.test.php
	tests/fixtures/article_fixture.php
Updating copyright year
Merge branch 'master' into develop
Merge branch 'develop' of github.com:CakeDC/tags into develop
Merge branch 'master' into 2.0
Merge branch '2.0'
Merge branch 'develop'