Merge branch 'MDL-51993-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2015 02:57:14 +0000 (10:57 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2015 16:56:21 +0000 (17:56 +0100)

Trivial merge