Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:51:30 +0000 (13:51 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:51:30 +0000 (13:51 +0800)
commit8d879f3928d4dc5078f07e933992b9fdec8d6a11
tree75a31ae2e478d9be7721b0d9628c5a11263bec32
parentbb9fd6b29d2aba4848ff21758d311e8dee204d3a
parentaca670170af945c869bfb8f1ae2f3fbb3612d23a
Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle