aj/chamilo-lms2

Autor	SHA1 Mensaxe	Data
aragonc	94984e6b12 merge	%!s(int64=10) %!d(string=hai) anos
Yannick Warnier	dfa34e5b00 Updated portfolio class declaration because it breaks phpoc (portfolio extending himself) and because I don't know what it is for	%!s(int64=11) %!d(string=hai) anos
Yannick Warnier	ebd9891350 Minor language variable fix - refs #4776	%!s(int64=12) %!d(string=hai) anos
Laurent Opprecht	bffe3f6015 #2851 portfolio integration	%!s(int64=12) %!d(string=hai) anos