d4f4edd Merge branch 'master' into f18

Merged and Committed by hannes 10 years ago
    Merge branch 'master' into f18
    
    Update to version 2.6.0 - which is a bugfix release
    
        
file modified
+2 -0
file modified
+4 -1
file modified
+2 -2