]> git.llucax.com Git - software/pymin.git/commit
Merge baryon.com.ar:workspace/pymin
authorNicolas Emiliani <nemiliani@integratech.com.ar>
Sat, 10 Nov 2007 19:56:14 +0000 (16:56 -0300)
committerNicolas Emiliani <nemiliani@integratech.com.ar>
Sat, 10 Nov 2007 19:56:14 +0000 (16:56 -0300)
commit6ed640af531e717da24d1dd423ce4f2df0fdec71
tree758e2aafd32242b5bbb6eee5200fc27ba413bec0
parentfa44834a03b01014380b5adf86f50398b5c5561e
parent3c717546f26524f438aeadc7776b57579400f7cb
Merge baryon.com.ar:workspace/pymin

Conflicts:

config.py
config.py