Merge pull request #845 from meyerrj/master
authorAlexis Christoforides <alexis@thenull.net>
Fri, 11 Apr 2014 19:16:16 +0000 (15:16 -0400)
committerAlexis Christoforides <alexis@thenull.net>
Fri, 11 Apr 2014 19:16:16 +0000 (15:16 -0400)
Support for video/mp4, video/ogg, video/webm


Trivial merge