Merge branch 'MDL-34933_23_STABLE' of https://github.com/mchurchward/moodle into...
authorDamyon Wiese <damyon@moodle.com>
Tue, 23 Apr 2013 04:02:30 +0000 (12:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 23 Apr 2013 04:02:30 +0000 (12:02 +0800)
commit3c719fafc5c9b58067638465067fe633ec9defde
treed273e7dfae4fed27327ddee36564c67c6ab0da7e
parent7d7824b0c1f183a4f0b92d84538d5e22726e47b7
parent54f03faba2543502c82d5a8aa1a248d391f1869d
Merge branch 'MDL-34933_23_STABLE' of https://github.com/mchurchward/moodle into MOODLE_23_STABLE

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