Merge branch 'MDL-45315-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 30 Apr 2014 01:55:10 +0000 (09:55 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 30 Apr 2014 01:55:10 +0000 (09:55 +0800)
commit8ced50e3da9e0bec8448fd0c7a27672b2ed36297
tree3d5e99cbbc02d37967c559f54e2e564ac19b143d
parentc6ac68eeada38f0f3d05b6640de80ea214ab773f
parenta15d2052e8caeb0ef09c9b91f047f485fd469b13
Merge branch 'MDL-45315-master' of git://github.com/danpoltawski/moodle