Merge branch 'wip-MDL-47613-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 08:59:57 +0000 (16:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 08:59:57 +0000 (16:59 +0800)
commitb065b569af8396cbe76eed00dd66ab9e6c6ef543
treeb3a7a6656d0b54ce515d30a76e8f08ab1a406298
parent22caa080f9e14f19036bfe0cc757ef688b7f7ecd
parentd8773d64fc6fc3c5b0f508713b1551eda2af975b
Merge branch 'wip-MDL-47613-master' of git://github.com/marinaglancy/moodle