Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 23:46:05 +0000 (00:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 23:46:05 +0000 (00:46 +0100)
commit2477bb29cc102b51c5b656472f2f6b0f14a5e16d
treebf283bcbea0773b0097656f8f5b502b094f3c5e3
parent64a807ae44d9da315eed9fd1b0061bcd30d616df
parent1e63755fb588733a97278207c8fac2f7ec1db8a2
Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle