Merge branch 'MDL-52589-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 15:31:23 +0000 (15:31 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:03 +0000 (09:31 +0000)
commit46767cc204e1004f58d16a7d1667574913c9afb9
treebb0e11ee01a72b9ec0b3bb19dbb1673c6eda1bf5
parenta17820bb70a222e0e32d822c26e1f6097d21c0d9
parentd9ffd8518acce98937759ac4be7cb2dd85ec0398
Merge branch 'MDL-52589-m' of https://github.com/micaherne/moodle