Merge branch 'MDL-40585_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE
commita8369f6a962621f3fe18f0423226f1727c2b9c0f
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 05:34:29 +0000 (23 13:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 05:34:29 +0000 (23 13:34 +0800)
tree66f71a48c5a18855974924952c7017d4720bb151
parentfdcad4d5f3678808d653b223ba055fcf9c923fea
parent619fc0cd3c01af69d6f9ccf25a932b992f15e3cb
Merge branch 'MDL-40585_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE