Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:18:07 +0000 (14:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:18:07 +0000 (14:18 +0800)
commit686150130e58a66d67b4f01d26fb20063b68eea3
treee08d3f1600572b290f4cd77336d07565a7763b6e
parentc5d4633fedb2cfb74a14066537a0c24f7ebec83a
parent0d7cb0f80537457392d3867fde2c33471e80e2d4
Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle