Merge branch 'MDL-52383' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jan 2016 02:16:19 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jan 2016 02:16:19 +0000 (10:16 +0800)
commitd60bf9f1ddd8ca99b6b7459d9a19d26ecd6dd7a4
tree2304c342883b0644ffef37dca48c4d756f12f90f
parent7ee117fab8b758a19c75c508588ba577e426e591
parent668aca18041c388952aaefb200e38c4020f0e45f
Merge branch 'MDL-52383' of https://github.com/stronk7/moodle