Merge branch 'MDL-34657_fixup' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Oct 2012 21:42:47 +0000 (23:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Oct 2012 21:42:47 +0000 (23:42 +0200)
commit7ba4b17f00ece70ae5308a9fc98e0ddec0e6ffed
treed719a32a5adb3cbba000124ca7a8d2046512904c
parente12a3e64ac4b0e88c0076273a01a50188476a53c
parent965d1670681f3dfe67133898ff9124b5890718ae
Merge branch 'MDL-34657_fixup' of git://github.com/timhunt/moodle