5 commits

Author	SHA1	Message	Date
serk	8a38afc7e7	for the merge	2017-01-21 04:32:54 +01:00
Ralusama19	45f1051b8c	integrados players. creo.	2017-01-21 03:42:50 +01:00
serk	e5bb93e489	fix	2017-01-21 03:24:24 +01:00
serk	0859b78f94	merge fix	2017-01-21 03:07:55 +01:00
serk	226a7b7657	aux commit	2017-01-21 02:32:26 +01:00