Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:51:51 +0000 (11:51 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:02 +0000 (16:32 +0100)
commit8d49ad2613e7c6096a4cfe41b6730b56541569fe
treedc9036507a11cf7d0d94ac6f4ebb54b7fecd2db7
parentd540aa8c708c068e0004fbf75dfcd44292aedab2
parentee5192614a0010268c9d96fc846f041d7b27797b
Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle