e1ccbf2 Merge branch 'f19' into f18

Merged and Committed by ajax 10 years ago
    Merge branch 'f19' into f18
    
        
file modified
+6 -0
file removed
-57
file modified
+8 -2
file removed
-1889
file removed
-1974
file modified
+152 -433
file added
+56
file modified
+1 -1