Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Watermark undefined varible
Merge branch '1.9.x' of github.com:FraGoTe/chamilo-lms into 6715
Modify wrong count row function - refs #6715