Merge branch 'MDL-37847' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 21:54:50 +0000 (22:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 21:54:50 +0000 (22:54 +0100)
commita35a7644b993795e055adb9bb4abf714eb1b368a
treebc1a08e88cc9e14e0ac1521182e555ad454c93f6
parent935ec5e77e29394feed4d55a5d0fa0a0751f7618
parentc0d12fc1cdd1c31087b968db0cd9d6e97145230c
Merge branch 'MDL-37847' of git://github.com/timhunt/moodle