Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)
commit1d79061651204c874f2d369b0d18ca3f5b700601
tree9291dc818c0f1613b7dafe9a179af29b6a16678d
parentdca771127a481b1f15db8d9967943a94ea8dbe32
parentb49964f7fc19f19d28bdead8d8edfb3c7c47f40f
Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle