Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 06:32:16 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 06:32:16 +0000 (14:32 +0800)
commit3f1bca9d56598d64b43b62ea138cefe94688b930
treebca945bfe54171ed167335066dcbd648a2720e99
parentbdb315cca269d3672e5dac589451375dd443b6e1
parentd2e3a1b4f9c1f568a23d972402f4c5747b5f73cb
Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle

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