775ccc7 Merge branch 'release-0.5.60' into release-0.5.61

Merged and Committed by Raymond Mancy 13 years ago
1 file changed. 13 lines added. 18 lines removed.
    Merge branch 'release-0.5.60' into release-0.5.61
    
    Conflicts:
    	beaker.spec
    	rel-eng/packages/beaker
    
        
file modified
+13 -18