Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)
commit409318eeff36eb9d47a6a00c58b74fb8bcaf5a48
tree94020bcdd805ecc4512a95c3a8f974ab157103b7
parentc31f7c58c1530825220716b93c4058c9a146cea8
parent7cd004e28530fb4ad07d751662b7cea600f25109
Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle