Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 07:54:07 +0000 (08:54 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 07:54:07 +0000 (08:54 +0100)
commit7b2945b847aba5938ffb814a373da3031ee76361
tree2387a2322c242a3581bdf4994dc836623a755cbf
parent006c84f3e77711a14e248e45ec1d55c726ca2593
parenta6019c29102902f72c01c8fee1921f0408659816
Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle