Update setup.csv
Update setup.csv
Update setup.csv
Merge pull request #18 from gBarrerasSanz/patch-1

Update setup.csv - Aceptado
Merge branch 'jorgeizquierdo-patch-2'
Merge branch 'master' of
https://github.com/UNIZAR-30246-WebEngineering/WebEng2014.git

Conflicts:
	labs/setup.csv
Merge branch 'master' of https://github.com/gginestra/WebEng2014 into
gginestra-master

Conflicts:
	labs/setup.csv
Merge branch 'gginestra-master'

# 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
# the commit.
Update soap.csv
Merge pull request #21 from ivanpinos/patch-4

Update soap.csv
Update soap.csv
Merge pull request #22 from RecuencoJones/master

Update soap.csv - Perfecto, gracias!
Update soap.csv
Update setup.csv
Merge pull request #23 from gBarrerasSanz/patch-2

Update soap.csv - Aceptado
Merge pull request #24 from JorgeGaruz/patch-1

Update setup.csv - Aceptado
Update setup.csv
Merge pull request #26 from alberto-648702/patch-1

Update setup.csv -- Aceptado
Merge remote-tracking branch 'upstream/master'