aj/chamilo-lms2

Аутор	SHA1 Порука	Датум
aragonc	94984e6b12 merge	пре 10 година
Yannick Warnier	dfa34e5b00 Updated portfolio class declaration because it breaks phpoc (portfolio extending himself) and because I don't know what it is for	пре 12 година
Yannick Warnier	ebd9891350 Minor language variable fix - refs #4776	пре 12 година
Laurent Opprecht	bffe3f6015 #2851 portfolio integration	пре 12 година