]> git.llucax.com Git - software/pymin.git/commitdiff
Merge branch 'procman' of baryon.com.ar:/home/luca/pymin into procman
authorLeandro Lucarella <llucax@gmail.com>
Tue, 13 Nov 2007 03:54:06 +0000 (00:54 -0300)
committerLeandro Lucarella <llucax@gmail.com>
Tue, 13 Nov 2007 03:54:06 +0000 (00:54 -0300)
Conflicts:

pymin/procman.py

nothing to commit (working directory clean)


Trivial merge