Merge branch 'require-paths' into plugin

Conflicts:
	src/static/timeslider.html
This commit is contained in:
Chad Weider 2012-03-10 18:26:40 -08:00
commit d594b2db34

Diff content is not available