Security exploit patch:
http://www.securelist.com/en/advisories/52134
http://rack.github.com/
Merge branch 'master' of github.com:variations-on-video/hydrant

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:variations-on-video/hydrant
Merge branch 'master' of github.com:variations-on-video/hydrant
Merge branch 'master' of github.com:variations-on-video/hydrant
the media object may not be valid at the time the file is uploaded
Merge pull request #25 from atomical/duration_not_set_bug

Duration not set bug