Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 15:34:18 +0000 (23:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 15:34:18 +0000 (23:34 +0800)
commitdcc08e55b5df5855de2291c4e1e98b8ce3966c64
tree62941609c66e3f63e521e60e6f03168eaae50ece
parenta28c6b440e5fa5604406fd6deb15c7a366138627
parent905729bf333b15e9d2d815b72b5539c306810325
Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle