Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 22:13:32 +0000 (11:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 22:13:32 +0000 (11:13 +1300)
commitdf1498f711bd173787dc1326c7b94287bcad3388
tree4cd421e0e2607c78560c1312ff553a05a4f8616e
parent87176b481e091158839d1616668469dbd907d302
parent11dd4dadb49d52b7ca4e4afd87bb9ef477feced0
Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle