acbe00f Merge branch 'upload_blocksize'

Merged and Committed by mikem 8 years ago
    Merge branch 'upload_blocksize'
    
    Conflicted with the recent profiles changes. Option defaults now live in koji/__init__.py
    
        
file modified
+4 -2
file modified
+9 -2