typo fixed in doc/providers.rst
merged branch peterkokot/docs-patch-1 (PR #778)

This PR was merged into the 1.0 branch.

Discussion
----------

Typo in doc/providers.rst

Commits
-------

81a0664 typo fixed in doc/providers.rst
Update intro.rst - Included links to Symfony2, Pimple and Sinatra

Included links to Symfony2, Pimple and Sinatra
merged branch royopa/patch-1 (PR #789)

This PR was submitted for the master branch but it was merged into the 1.0 branch instead (closes #789).

Discussion
----------

Update intro.rst - Included links to Symfony2, Pimple and Sinatra

Included links to Symfony2, Pimple and Sinatra

Commits
-------

f9c13a1 Update intro.rst - Included links to Symfony2, Pimple and Sinatra
fix docblock
merged branch cordoval/patch-2 (PR #787)

This PR was submitted for the master branch but it was merged into the 1.0 branch instead (closes #787).

Discussion
----------

fix docblock

Commits
-------

fbf12a5 fix docblock
fixed order of route registration for mounted controllers
Event helpers add listeners directly after boot

Fixes #748
bug #815 Event helpers add listeners directly after boot (davedevelopment)

This PR was submitted for the master branch but it was merged into the 1.1 branch instead (closes #815).

Discussion
----------

Event helpers add listeners directly after boot

Fixes #748

Commits
-------

f67cd45 Event helpers add listeners directly after boot
bug #813 fixed order of route registration for mounted controllers (fabpot)

This PR was merged into the master branch.

Discussion
----------

fixed order of route registration for mounted controllers

simpler alternative for #736 in order to fix #716

Commits
-------

4e6031e fixed order of route registration for mounted controllers
removed whitespaces in docs
Fixed typo in "Controllers in classes" paragraph
minor #821 Fixed typo in "Controllers in classes" paragraph (sensorario)

This PR was merged into the master branch.

Discussion
----------

Fixed typo in "Controllers in classes" paragraph

Commits
-------

0983ea1 Fixed typo in "Controllers in classes" paragraph
removed dead code
Merge branch '1.0' into 1.1

* 1.0:
  fix docblock
  Update intro.rst - Included links to Symfony2, Pimple and Sinatra
  typo fixed in doc/providers.rst
Merge branch '1.1'

* 1.1:
  Event helpers add listeners directly after boot
  fix docblock
  Update intro.rst - Included links to Symfony2, Pimple and Sinatra
  typo fixed in doc/providers.rst
updated CHANGELOG
prepared the 1.0.2 release
Merge branch '1.0' into 1.1

* 1.0:
  prepared the 1.0.2 release
  updated CHANGELOG

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php
updated CHANGELOG