Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 05:03:32 +0000 (13:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 05:03:32 +0000 (13:03 +0800)
commite7af63633efd467423851954d443eff85ffb260a
tree5880ae41d87e419fb12a57a658fa283aab01b91f
parentebe051792daab7a9cfdd5c9e8894c8c885950b8c
parentfb16acf24e3be71b5d1431ee208ad9fa20ae535d
Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt