Merge branch 'MDL-49666' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:18:14 +0000 (19:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:18:14 +0000 (19:18 +0100)
commitf5c493f75e9ef3c1e31eefab167f3e0dc1753c05
tree591cdb1c388f2ad7aa07cd57a9b6ac60915f8ce7
parentf0fb1ed5181fdf86b1f47190f65bf9e5ab3d1f9d
parent063cbe93e3aef2ab1152a69844e61487ea959608
Merge branch 'MDL-49666' of git://github.com/timhunt/moodle