Removed trailing spaces
Adding keep ratio modes
fixed video conversion library check
Fixes for and resizing 90/270 rotated videos and for rotating 180 videos
Merge pull request #42 from nifuramu/fix-rotate-pad-style

Bug fix for auto_rotate with pod style
Merge pull request #45 from Nikita-V/keep_aspect_modes

Keep aspect ratio modes
Merge branch 'Xtinct-master'
Merge branch 'master' of github.com:owahab/paperclip-ffmpeg

Conflicts:
	lib/paperclip_processors/ffmpeg.rb
Merge branch 'master' of git://github.com/rocketmobile/paperclip-ffmpeg into rocketmobile-master

Conflicts:
	lib/paperclip_processors/ffmpeg.rb
Merge branch 'rocketmobile-master'
Pumping version
Regression after #50
Merge remote-tracking branch 'upstream/master' into fix-crop