Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Feb 2017 01:18:17 +0000 (09:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Feb 2017 01:18:17 +0000 (09:18 +0800)
commitea6eb1cc482b71bbfb1915dd0346442cc1e5e16e
tree0ac2a4bdbe8acba884307e7894dca36205f202e0
parent6fd35788c1b740342726560c5acc28563776a16b
parent46c5c88321c850043393f9be4830af0ef9bfd979
Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle