fixed CS
Fixed the composer constraints
Added a branch alias for the master branch
merged branch stof/patch-1 (PR #125)

Commits
-------

759da8e Fixed the composer constraints

Discussion
----------

Fixed the composer constraints

The composer constraints are wrong currently: the unbound constraint on common means that you cannot release without knowing all future releases of Common (as tags cannot be fixed later) and the FrameworkBundle requirement was wrong as the 2.0 branch does not work with 2.1
When merging the 2.0 branch into master, you will of course need to update the constraint to ``2.1.*``

Btw, you should probably tag a release of the bundle as the default behavior in composer will change at the end of the month, setting the minimal stability to stable instead of dev (which is the default now to let people do the switch as there was no stability flag until one month ago)
merged branch stof/patch-2 (PR #126)

Commits
-------

3144b9d Added a branch alias for the master branch

Discussion
----------

Added a branch alias for the master branch

This will allow other bundles depending on it to avoid the unbound constraint.

Note that I haven't fixed the constraint here to avoid conflicts when merging 2.0 into master after #125. Tell me if you prefer having the change in this PR.
Merge branch '2.0'

* 2.0:
  Fixed the composer constraints
Fixed the composer constraint for 2.1
merged branch stof/patch-4 (PR #128)

Commits
-------

82f37fe Fixed the composer constraint for 2.1

Discussion
----------

Fixed the composer constraint for 2.1

@fabpot you forgot to update the requirement when merging 2.0 into master

---------------------------------------------------------------------------

by stephpy at 2012-06-15T08:18:06Z

+1 for this, my project is broken

---------------------------------------------------------------------------

by ricbra at 2012-06-15T08:38:04Z

+1

---------------------------------------------------------------------------

by blaugueux at 2012-06-15T08:38:42Z

+1

---------------------------------------------------------------------------

by naahuc at 2012-06-15T08:39:37Z

+1

---------------------------------------------------------------------------

by SterinGM at 2012-06-15T08:39:44Z

+1

---------------------------------------------------------------------------

by cedriclombardot at 2012-06-15T08:42:30Z

:+1:

---------------------------------------------------------------------------

by Ph3nol at 2012-06-15T08:44:46Z

+1 :)
ignore lock file
Use Composer for testing
Add Travis-ci file
simplified code
enable support for config:dump-reference
merged branch lsmith77/dump-reference (PR #129)

Commits
-------

05a3255 enable support for config:dump-reference

Discussion
----------

enable support for config:dump-reference

---------------------------------------------------------------------------

by stof at 2012-06-20T10:06:38Z

you should implement the ConfigurationInterface on the class

---------------------------------------------------------------------------

by stof at 2012-06-20T10:07:42Z

btw, you could remove the ``getConfigTree`` method entirely by changing the DI extension to use the ``$this->processConfiguration()`` shortcut

---------------------------------------------------------------------------

by lsmith77 at 2012-06-20T10:15:33Z

i know .. but i wanted to be minimally invasive since i didn't want to bother with testing against 2.0.x

---------------------------------------------------------------------------

by stof at 2012-06-20T10:18:06Z

this shortcut exists since the 2.0 beta releases. And anyway, the master branch is for 2.1 only

---------------------------------------------------------------------------

by henrikbjorn at 2012-06-20T10:38:19Z

Sry wrong tab :p
custom request parameter name in options
refactored the configuration code
merged branch zerkalica/master (PR #132)

Commits
-------

981578e custom request parameter name in options

Discussion
----------

Custom request parameter name in options

Model id parameter name hardcoded in DoctrineParamConverter::find as id. This fix adds parameter name  mapping.

``` php

     * @Route   ("/{user}/show")
     * @ParamConverter("user", class="MillwrightUserBundle:User", options={"id" = "user"})
     * @Template()
     *
     * @return array
     */
    public function showAction(UserInterface $user)
    {
    }
```
udpated doc for previous merge
Add clear example with two param converters
merged branch Seldaek/patch-1 (PR #134)

Commits
-------

1cc791d Add clear example with two param converters

Discussion
----------

Add clear example with two param converters