Merge branch 'master_MDL-39910' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:04:27 +0000 (09:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:04:27 +0000 (09:04 +1200)
commit339feb64205c212f1e4084b0b39ce9952cf5cc01
treec1934cb0c0c944c970aeecd3f8aa0f5ea3ea14b5
parentc99fcebdedcd45925a500ac3291fc2b9728890ea
parentdf5c7086c80bcec064a6303d179e15440aac3d74
Merge branch 'master_MDL-39910' of git://github.com/danmarsden/moodle