Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Dec 2013 21:52:11 +0000 (10:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Dec 2013 21:52:11 +0000 (10:52 +1300)
commitf2d7e2dca9b95c50acea30ba26ba84cc1cdd3ac5
tree48e416a47c161dbba65b7b2a9f0388dadfc91c70
parent06ef842707c0b2679f1cf80910b66ec0dbf7e32c
parent74c4405b8aa422233f4abf764f548a6c5e126066
Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle