Merge branch 'wip-MDL-47617-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:17:36 +0000 (13:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:17:36 +0000 (13:17 +0100)
commit8a7b6d292d096eef71fc7666802e25962b692263
treeb8ae6a9ad74c4fc727785af464e07c221af47c81
parent3be2f6ac0b7fe6fe1bf107c5d7ad27ab47d4dfaa
parentc1a27029feb984e891e57a2b6e188e5c2ae8e267
Merge branch 'wip-MDL-47617-master' of git://github.com/abgreeve/moodle