Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle
commitcf13ece570115f5c0807ceffd510d9a3fbc1e2f6
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 05:36:17 +0000 (29 13:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 05:36:17 +0000 (29 13:36 +0800)
treec25c97457d5557f603a9143d8c07dd946dee7fe6
parente30a684a4bebb634101b7efc794d1beeb8cb4718
parentd5653c6968e9e13c8d59d00af0cccde263daaee1
Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle