Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)
commitf01242a3b485cf4ddef0a37994a4e8ff81c341d2
tree7c8bb0cf28a64f47ab99e089840dd9a9c4823e33
parenta92008ed25b9a9de884e664c5d5570b1163bd814
parentd1020cd5d401b4c3292ac39987ca18f8b2ad83d2
Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle