Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 13:24:57 +0000 (14:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 13:24:57 +0000 (14:24 +0100)
commitc7d17be4172af44b0bab21e60ae4795a3ea9095d
treeb36ce58e6c3d60fb8f041e56de350333079ef9a0
parentedc3889618dc822053015bb1028ae36b5c2c97c9
parent0c4c3b9aed7f2d47b29396ecdfc1801312b37c86
Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle