added documentation on inset and outbound modes of thumbnail filter Documentation (issue #207)
Merge pull request #210 from rjbijl/doc-fix

added documentation on inset and outbound modes of thumbnail filter Documentation (issue #207)
small fixes on Thumbnail docs
fix E_NOTICE "Undefined index: mode"
Update dependency 'imagine/imagine' to 0.5.*
Watermark loader
Merge pull request #221 from KingCrunch/dep-imagine-0.5

Update dependency 'imagine/imagine' to 0.5.*
Add simple documentation
Merge pull request #222 from KingCrunch/watermark-filter

Watermark loader
add AwsS3Resolver for new SDK version
Merge pull request #227 from havvg/master

add AwsS3Resolver for new SDK version
Corrected aws-sdk-php link
Merge pull request #233 from javiacei/patch-1

Corrected aws-sdk-php link
fix missing filename in exception
Merge pull request #240 from havvg/master

fix missing filename in exception
deprecate the phpcr loader as CmfMediaBundle provides a better one now.
Merge pull request #243 from liip/deprecate-phpcr-loader

deprecate the phpcr loader as CmfMediaBundle provides a better one now.
Set ContentType of AWS cache object

Partial fix for #238
Merge pull request #246 from eXtreme/aws-contenttype

Set ContentType of AWS cache object
Add upscale filter