098bdb0 merge to get common history in all branches

Merged and Committed by Björn Esser 9 years ago
    merge to get common history in all branches
    
        
file removed
-37
file removed
-11
file removed
-11
file removed
-11
file modified
+136 -78