sonata-project/SonataMediaBundle — pull request #141 by pulse00 (2012-04-17 22:58:08+00:00)
Title: Merged 2.0 branch

I've merged the 2.0 branch into master. There where 2 conflicts: 4facc03f81d570186c6f75f5587b6d98524c42b6 which had to be resolved:

- https://github.com/pulse00/SonataMediaBundle/commit/4facc03f81d570186c6f75f5587b6d98524c42b6#diff-46
- https://github.com/pulse00/SonataMediaBundle/commit/4facc03f81d570186c6f75f5587b6d98524c42b6#diff-49