Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 07:46:01 +0000 (08:46 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 07:46:01 +0000 (08:46 +0100)
commit78f284b6ea89d8999f5814a93967abb48977146f
tree3f84dacb745c797ab0cce69ac19134cd0472a017
parentc35e9b73a54124f2e3afdba0034ff15ceceb934d
parentf1272bbecd703e9c6f7ae7eb0435cb89d440e2c3
Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle