Merge branch 'MDL-51162-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2015 02:48:14 +0000 (10:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2015 02:48:14 +0000 (10:48 +0800)
commitdc2091c87f4fb488a5845db21e5e357a72b58b32
tree83a18f5ba7af1ee5137cf908a872c0b51bbeea3f
parentd6ed5f82301ce5144950d693363d049cd0a054d8
parent4d16a2749f8b5d6dd2858106b5cae5e383256fa7
Merge branch 'MDL-51162-master' of git://github.com/lameze/moodle