sonata-project/SonataMediaBundle — pull request #151 by pulse00 (2012-05-11 08:15:48+00:00)
Title: Merged 2.0 into master

Solved 2 (trivial) conflicts:

* `Thumbnail/FormatThumbnail.php`: DocBlock return type
* `composer.json`