parameters 20122013
pre-produccion
Merge branch 'pre-master' of https://github.com/valeraovalles/sait into pre-master
Merge branch 'pre-master' of https://github.com/valeraovalles/sait into pre-master
Merge branch 'master' of https://github.com/valeraovalles/sait
Merge branch 'jhoan'
master
Merge branch 'pre-master' of https://github.com/valeraovalles/sait into pre-master
Merge branch 'pre-master' of https://github.com/valeraovalles/sait into pre-master
parameters
sit, visitas
show contratos
Merge branch 'pre-master' of https://github.com/valeraovalles/sait into pre-master
views contratos
jornada
jornada
Merge branch 'jhoan'
prueba de jornadas
Merge branch 'pre-master'
jornada