Updated DoctrineBundle to 1.1.*
merged branch stof/patch-1 (PR #473)

This PR was merged into the 2.1 branch.

Commits
-------

b675b84 Updated DoctrineBundle to 1.1.*

Discussion
----------

Updated DoctrineBundle to 1.1.*

The branch alias of DoctrineBundle master was previously 1.0.x-dev, but it was adding new features. So it has been released as 1.1.0 instead. This will allow people starting with the next Symfony 2.1 release to benefit from the DoctrineBundle improvements done in the last 6 months.

Another PR for 2.2 is coming
updated VENDORS for 2.1.7
updated VENDORS for 2.1.7
Narrow paths being ignored by git

A leading slash is not required when there is one in the middle of the path but this way is more consistent.
merged branch frosas/patch-1 (PR #486)

This PR was merged into the master branch.

Commits
-------

11ca118 Narrow paths being ignored by git

Discussion
----------

Narrow paths being ignored by git

With current patterns paths like `web/vendor/bootstrap-2.2.2` are ignored.
fixed .gitignore to be more specific about exclusions
Merge branch '2.1'

* 2.1:
  fixed .gitignore to be more specific about exclusions
  updated VENDORS for 2.1.7
  updated VENDORS for 2.1.7
  Updated DoctrineBundle to 1.1.*

Conflicts:
	.gitignore
	composer.json
	composer.lock
enable chromephp logging
merged branch vicb/chromephp (PR #487)

This PR was merged into the master branch.

Commits
-------

e0e92d8 enable chromephp logging

Discussion
----------

enable chromephp logging
added missing branch-alias in composer file
Merge branch '2.1' into 2.2

* 2.1:
  added missing branch-alias in composer file
updated branch-alias version
updated branch-alias version