Merge branch 'MDL-42882-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 00:12:57 +0000 (13:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 00:12:57 +0000 (13:12 +1300)
1  2 
lib/db/upgrade.php
lib/upgradelib.php

Simple merge
Simple merge