Merge branch 'MDL-52895-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Feb 2016 09:43:21 +0000 (09:43 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Feb 2016 09:43:21 +0000 (09:43 +0000)
commit37f77a1b37b0da1066aad64f686d4cdf5e15f5df
treef73d597dd7b4f6259cf1cc1903e5749a73b676f7
parentba4fd381e0a16766a06feaa9e3895af662fe2570
parent0bf6c0bebe2133fa50f468d5b5990efa4635e3d3
Merge branch 'MDL-52895-master' of git://github.com/jleyva/moodle