Merge branch 'MDL-51855-master' of git://github.com/lameze/moodle
commiteb154d9c1469b6f058c1be4c02e9e52321da3a84
authorDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 10:20:02 +0000 (26 10:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 10:20:02 +0000 (26 10:20 +0000)
treea789c3d084b355f783570646d473d60c4a1f12a2
parentf7d8c61ae75bba331ccf724d77989188272cc6c4
parentabc249121122dc67daee2725f6e6fa50af1683a7
Merge branch 'MDL-51855-master' of git://github.com/lameze/moodle