aj/chamilo-lms2

Autor	SHA1 Mensaxe	Data
Julio Montoya	bdd6eb1b9e Partial merge with 1.11.x see BT#15952	%!s(int64=5) %!d(string=hai) anos
Nicolas Ducoulombier	f8389282f5 correcting link in copy field of bbb session HTML5 and Flash to put the r in interface	%!s(int64=5) %!d(string=hai) anos
Alex Aragón	be82d6afef add icons conference type - refs BT#14664	%!s(int64=6) %!d(string=hai) anos