Merge branch 'mdl48517' of https://github.com/tlevi/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:15:51 +0000 (15:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:15:51 +0000 (15:15 +1300)
commit255501c90041ee12b9eca0a60821aa439e640305
treefd7fb9bcc945c6c52d4d65fbe5bb60bf57aacd95
parent13ff5c990c23e5e51170f27abb2bb487ebb75be2
parent064b8b7fe3594089ee7262c378d1add53eeb945c
Merge branch 'mdl48517' of https://github.com/tlevi/moodle