Merge branch 'MDL-46236_27' of git://github.com/nobelium/moodle into MOODLE_27_STABLE
commit0fbda60bb3d78c5d2587b8d33dba9d0c7231cd94
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 11:04:32 +0000 (29 12:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 11:04:32 +0000 (29 12:04 +0100)
tree8a7b228c0c8dc4f38cf6adc957d04c286cacc14b
parent74980995b4e78dacebc295d369326a67234ce6c8
parent568e9560afc7ef2cfa2bc6fc5676b728777431f4
Merge branch 'MDL-46236_27' of git://github.com/nobelium/moodle into MOODLE_27_STABLE