Merge branch 'MDL-51563-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:50:10 +0000 (13:50 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:50:10 +0000 (13:50 +0100)
commit52fa3d09d7d702f2600bae768156080af258ccef
treef3aa5d7f6ed63b0ac21a988cf55b438790a6eb40
parent6bafde62f569210b443694f17727c8b04b6b26d7
parentd1b30757bd8b1102994ad964468624f58fdbf6f7
Merge branch 'MDL-51563-master' of git://github.com/jleyva/moodle