3 Commits

Author	SHA1	Message	Date
Seth Call	9279d88d8d	* VRFS-2876 - pro licensing added and 20 second snippet	2015-03-10 22:10:22 -05:00
Seth Call	aabbd90b02	* VRFS-2602 change jka to jkz	2015-01-05 14:39:55 -06:00
Steven Miers	433fe0be74	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00