Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 03:13:40 +0000 (16:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 03:13:40 +0000 (16:13 +1300)
commit44a4b3d0725b5f635b5bc944e3a057d092f62094
treed1db5904c99b69b99f8a6d5bcf7a43b6d00d176d
parent54907a6a9b05ca777e958f50cf6957d346c71d02
parent141e7d874706678a55964de43e16e1107aee3491
Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle