Merge branch 'MDL-47666' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:31:20 +0000 (17:31 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:31:20 +0000 (17:31 +0100)
commitfb45249754f3b0158eb46d57492720d28646213d
tree6260ee169c1c14fc52f08f37e67a82b13eb06063
parent6366cc0774fd98affc54bb46b66b55a283e2d502
parenta20d6752506f00a4dc8e07f8432ba77fce319fcb
Merge branch 'MDL-47666' of git://github.com/timhunt/moodle