712732f Merge branch 'master' into f12/master

Merged and Committed by peter 13 years ago
    Merge branch 'master' into f12/master
    
        
file removed
-0
file added
+0
empty file added
encfs-1.7.2.tgz.asc encfs-1.7.1.tgz.asc
file renamed
+3 -3
file modified
+5 -2