Merge branch 'MDL-52784' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:54:55 +0000 (08:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:54:55 +0000 (08:54 +0800)
commitf3d23df572bb6812f3a65d6991daecc156c4e1bb
tree8269eda0dedb49b03a01702385ce16210eb2a8bf
parent9dd33a288e5f8ac1bf851ca1a0033e5e321adedd
parenta82f26e324958a587b464052e43c6d899211a864
Merge branch 'MDL-52784' of git://github.com/timhunt/moodle