Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 09:14:28 +0000 (10:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 09:14:28 +0000 (10:14 +0100)
commit36650d6f516c3a4b179b58077cc3f99741348c81
treeb0d718e10aad5a56b2dd91cc045e79d2e2357d7f
parent46e120c561c4239ae715475e10efbb148abbc43a
parent2d10823a7cc76710429dabd2b6a272bee50ce395
Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle