Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 05:16:55 +0000 (13:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 05:16:55 +0000 (13:16 +0800)
commitf6c2af867fd106990bd6d648a1b68a8610c4a9b2
tree2cf3dfb69da36b9cc858dc402ba7d52db1c5a07f
parent92058753ace96bdbf67572ff9103ed0e1cdce4d3
parent3d1808c6e24e2cdf5b320831498653c60eabf7d2
Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle

Conflicts:
lib/db/upgrade.php
version.php
backup/moodle2/restore_stepslib.php
lib/db/upgrade.php
lib/pluginlib.php
version.php