Merge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23...
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Feb 2013 05:31:40 +0000 (13:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Feb 2013 05:31:40 +0000 (13:31 +0800)
commitbf78144a45f9eb0971081c3730a67807b9292c44
tree2ed604359294a0edf1828f9c12ba72e4e1e0da60
parent45c8baafd0041bc39ba917221e3265f076a36cba
parent0c9e550defdcff92d1c4a9f616a492f8ad80d63a
Merge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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