Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle
commit76aa53f2d8e2b05cdcf92fd44cacef5568492514
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:48:27 +0000 (29 14:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:48:27 +0000 (29 14:48 +0800)
treeb33bdd89857f4ea3dbcff82b9aa0e168bc4431af
parentc426631850583777f1f93e4e159ff7f4ad798d65
parent0f965ca9014958b06f15a6cbc25b6b7dd61ca2fd
Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle