]> git.llucax.com Git - software/pymin.git/commitdiff
Merge branch 'master' into suse
authoror3st3s <or3st3s@underworld.localdomain>
Mon, 12 Nov 2007 12:32:06 +0000 (12:32 +0000)
committeror3st3s <or3st3s@underworld.localdomain>
Mon, 12 Nov 2007 12:32:06 +0000 (12:32 +0000)
1  2 
config.py

diff --cc config.py
Simple merge