Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)
commit7b6464bf9d5ff3001de94dfb3186e40bf86ab3c6
tree04814bb45e756d98c74aa8cb6403b1c3889fea48
parentbc6d39a561eae77a6b11bed4578e2a7b20694e88
parentbed27b3024319e12ac97edea99ad9c0c3c2289a3
Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle