Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:31:19 +0000 (11:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:31:19 +0000 (11:31 +0800)
commit4a837c7ba0f4b62f996c4b766e63e8bb3c73992d
tree89a4c49cf438731d2929add20cfb75e44dd869f2
parentad6b958997f63da1bb973375fc8f2af8204f9483
parent8675453e8207a9cf3adc628136ed8ecfc698ecca
Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle