Merge branch 'MDL-42338_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE
commit3a32362a3059ace0abe0151f0fe183aaf472cc55
authorDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 08:29:11 +0000 (24 16:29 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 08:29:11 +0000 (24 16:29 +0800)
tree51c583dae5020100d430e4ed9359247eed90349e
parent860553218c3b9dda1895b09e8750700fe10e41b2
parent4b178e7ab62c088eaf78b9ea5cb837b661a47c87
Merge branch 'MDL-42338_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE