Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 04:23:41 +0000 (12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 04:23:41 +0000 (12:23 +0800)

Trivial merge