05f913 - Update to upstream

Authored and Committed by mgrepl 9 years ago
    - Update to upstream
    - Cleanup for sandbox
    - Add attribute to be able to select sandbox types
    
        
file modified
+1 -0
file modified
+618 -805
file modified
+7 -2
file modified
+1 -1