Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle
commitc6b7551c71084b498c6883420dcff7bf094873ee
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 08:59:16 +0000 (11 16:59 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:31:52 +0000 (13 18:31 +0100)
tree53e0dea9157958237543cfb319455963f7e50dc7
parente2cb3ffad6b30bd8beb562e89e5ddc76ecff3f2d
parent7cd6abf28afc62611a63a1bef9c38b35e51bca4b
Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle