Merge branch 'MDL-41366_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commitcb096cef51e922e9530d57ce5aa491f11d646eb5
authorDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 10:09:41 +0000 (27 18:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 10:09:41 +0000 (27 18:09 +0800)
treeac02728bdd71a51eabec1c25cc2b1b61fa0f49e0
parent01209ab96bd2005788d2ce55cfb5043e03ffb95d
parent3272a3f77159c82d2d07a5b3125608784fe9c722
Merge branch 'MDL-41366_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE