Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 10 Dec 2014 02:29:06 +0000 (15:29 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Dec 2014 12:24:38 +0000 (13:24 +0100)
commitf6c65c2575bb5ca986d093ed3f9d17b892c65c91
tree222356b676461b5d9862f09a5ef67838ea5f7e97
parente600e6ae505221d8a538b48c817d4826ad5dc7c6
parent8e371539f423be1717d0f7a51feee48b5d9e3788
Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle