Merge branch 'MDL-46215-master-fixes' of git://github.com/andrewnicols/moodle
commit45b7a397bb020738cd478b684ffdb725003c510b
authorMarina Glancy <marina@moodle.com>
Tue, 28 Oct 2014 07:37:05 +0000 (28 15:37 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 28 Oct 2014 07:37:05 +0000 (28 15:37 +0800)
treeaa44ccdea2566d0c45854ddec4c8de1ac62e6142
parentdb310f773732e47a51cfc972e6710d46a4753785
parent79b4fb128295d973c39e9aa6a59d9001832b1a0e
Merge branch 'MDL-46215-master-fixes' of git://github.com/andrewnicols/moodle