]> git.llucax.com Git - software/pymin.git/commit
Merge commit 'nico-baryon/master'
authorLeandro Lucarella <llucax@gmail.com>
Mon, 22 Oct 2007 16:11:43 +0000 (13:11 -0300)
committerLeandro Lucarella <llucax@gmail.com>
Mon, 22 Oct 2007 16:11:43 +0000 (13:11 -0300)
commit71a35239852c629c02006219427db45b75bc24da
tree7978305e907ae3c7b50c550c4d3da47dc6627c9b
parent0dcb923d42a7489756eddd83a13a3059d8a24b2a
parent60de22ab6dba022c4a6ed243c15f1e941f8154cd
Merge commit 'nico-baryon/master'

Conflicts:

pymin/services/ppp/__init__.py
pymin/services/vrrp/__init__.py
pymin/services/ppp/__init__.py
pymin/services/vrrp/__init__.py