Merge branch 'MDL-47681-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 14:14:20 +0000 (15:14 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 14:14:20 +0000 (15:14 +0100)
commitf931c9245efb70e6aa5c02a91cb82e397977944c
tree9e697fca3f106437fe25db37649a0e2271d66079
parent5763316186f75e9f3c208c6b37cece374c6f5f8f
parentf8c8f980c7a0f63b41955d87826108b3a5d67fd7
Merge branch 'MDL-47681-master' of git://github.com/FMCorz/moodle