fiveDots/SisTrans — pull request #1 by fiveDots (2014-03-13 17:34:22+00:00)
Title: Merge branch 'coniodetuputamadre' into coniodetumadre

Conflicts:
Iteracion2/.classpath
Iteracion2/bin/.gitignore
Iteracion2/bin/fachada/CabAndes.class
Iteracion2/source/dao/ConsultaDaoAdmin.java
Iteracion2/source/fachada/CabAndes.java
Iteracion2/source/vos/PedidoAdminValue.java
Iteracion2/source/vos/PedidoProveedorValue.java