Merge branch 'MDL-51586-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 09:47:13 +0000 (10:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 09:47:13 +0000 (10:47 +0100)
commit0015ec87d674c57ee9fbc60182efb2e4b0c2d3e8
treed1d0a0c4d04d79e6602a1e973562b9235daf2da6
parentfd47ef44bdb63473253cf7f268b421192376fe7a
parentd5994d38c9ef17c0ac4ec7e54f992d9350c3b715
Merge branch 'MDL-51586-master' of git://github.com/xow/moodle