Merge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jun 2015 11:37:05 +0000 (12:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jun 2015 11:37:05 +0000 (12:37 +0100)
commit782300f3a8137f7917fc2b9d558a885ab1c06407
treef410c3d80413b580879e727d728302f8f60bc68a
parent20a16512ee8eed690727a5317bfe922e37b6e65b
parenta939ae6da755b2492a03681801eb23adf35f3ff8
Merge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle