Merge branch 'MDL-48682_28' of git://github.com/dmonllao/moodle into MOODLE_28_STABLE
commitdd8b3324ef5f814371d2713a7c51f7a08eb44c2b
authorDan Poltawski <dan@moodle.com>
Tue, 10 Mar 2015 08:25:30 +0000 (10 08:25 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Mar 2015 08:25:30 +0000 (10 08:25 +0000)
treeea210c0a0d6b1b221716dd25fa53ac91a39852a5
parent3fca7fd7c7ba7173d1fce6c6586539d9a17fced0
parent69023cd3e907fd6565a93d883cee4eb4405b0293
Merge branch 'MDL-48682_28' of git://github.com/dmonllao/moodle into MOODLE_28_STABLE