actualizarStock
actualizarStock
conexion
conflictos
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014
into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
#
 Hice un merge