Merge branch 'MDL-48213-m27-master' of https://github.com/dthies/moodle into MOODLE_2...
commit1dca0feabd13a4352fb04dd4c26c9334f867c47f
authorDan Poltawski <dan@moodle.com>
Tue, 23 Dec 2014 16:13:37 +0000 (23 16:13 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Dec 2014 16:13:37 +0000 (23 16:13 +0000)
tree56a9e28235536866e028799923d3f34827ce1e09
parent0e045c4c2033c1b0fe702a766ff49a2eae87a0c1
parentf69e7f22632856dd768aebd4ffc3e92e8234981f
Merge branch 'MDL-48213-m27-master' of https://github.com/dthies/moodle into MOODLE_27_STABLE