6c3ccef Merge branch 'licensing'

Merged and Committed by mjg 10 years ago
1 file changed. 60 lines added. 56 lines removed.
    Merge branch 'licensing'
    
        
file modified
+60 -56