sakaiproject/nakamura — pull request #384 by marktriggs (2011-11-02 21:12:04+00:00)
Title: KERN-2272 Merge the Kaltura bundle into Nakamura

Hi all,

This pull request merges the Kaltura integration bundle developed by Unicon for NYU. I've split it into two commits:

# A straight up merge of Unicon's original code
https://github.com/marktriggs/nakamura/commit/e616b0292770a72e85bf528c0cb6041bbc0a2ad2

# Changes made by me when merging into Nakamura (?w=1 is useful because a lot my changes were whitespace cleanups)
https://github.com/marktriggs/nakamura/commit/41b8dda6d2e9bade072ccc4419ff7026a71b194f?w=1

The corresponding 3akai-ux changes will follow shortly, but it doesn't matter if this gets merged before they do.