Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 06:22:38 +0000 (16:22 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 06:22:38 +0000 (16:22 +1000)
commitcb88ffb6982c8e12ac225ac21168065bd7321f5a
tree9001da2c3eb3d1b0b574937dcac7b7669251bcc5
parent858fc79db8f3dec7705ff724b1a70c0c0bfca241
parentc122f484c50f2e686a3f82260efa84c49d16579d
Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle