Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)
commit147df77923ea1163188c1d7567db0fe69b15cf5c
treeaf5b05002411b9c532836520e78658f9054d0c09
parent631edc10aec07a447c7cf0c25cb90d4fc2a53d2e
parent1f5a347b46445e21a8f2b7bfaf69d299a1852a76
Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle