Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Feb 2013 05:35:36 +0000 (13:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Feb 2013 05:35:36 +0000 (13:35 +0800)
commit82a6332837b57fa67e6aad30cb6ca053330fe201
tree13514050ee2c79753e4e2cca5ae3d5906b093d8a
parent93d5dc1c03f44a4625ff5311e878d35903376dc0
parent3f61e4cbf363b1d925156e7779cce6d1c12fc914
Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle

Conflicts:
lib/db/upgrade.php
version.php
lib/db/upgrade.php
version.php