6a0124e Merge branch 'f21' into f22

Merged and Committed by ctubbsii 8 years ago
    Merge branch 'f21' into f22
    
    Bump to 3.4.6-11 for rebuild, but without f21-specific rollback
    of netty version.
    
        
file modified
+7 -1