Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle
commitd0143e006161e32bff9627e6dad9b2023770976c
authorMarina Glancy <marina@moodle.com>
Tue, 2 Sep 2014 01:58:24 +0000 (2 09:58 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 2 Sep 2014 01:58:24 +0000 (2 09:58 +0800)
tree0196e58f1e3ca4fb50dc351c1e252145dfab50d5
parentf9f715de75c94d477c11569b75560e592dde302c
parent829d4e3d412c2a529120fcec896e051da3ba1543
Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle