joan 22:43
angel 00:08
angel 00:45
angel 04:04
angel 10:52
angel 10:53
angel 10:54
joan 10:57
angel 11:29
Merge remote-tracking branch 'remotes/upstream/pantalla19_autocompletado'

Conflicts:
	java/.classpath
angel 11:47