Merge branch 'MDL-30960_master' of https://github.com/danielneis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 10:42:10 +0000 (11:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 10:42:10 +0000 (11:42 +0100)
commitca5c7d7535be7603393aebdd0539b0ad4a84e70d
treebfb559036fc55ed6c6cc23003966257ede9e1b90
parent29645f9745fd1153a8f7bb79888e6f090080ac17
parent2108ac8a4faf18b37d14dd14a77b0d262eba67f2
Merge branch 'MDL-30960_master' of https://github.com/danielneis/moodle