Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Apr 2015 10:39:18 +0000 (11:39 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:18 +0000 (10:19 +0100)
commit9548d1e0583cca7aeb9232102751f8962856cf29
tree3a7aee155b6306ff7268fcf5c27ee8c76fbd8a82
parent9dbcdd8b1fcc05d7829e29f24ea94eb4cef55d3e
parente14388e3a72d108903357b75d635f6eed01358b8
Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle