Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 20:49:29 +0000 (08:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 20:49:29 +0000 (08:49 +1200)
commitbd633dda9a7ed63ad427761fe3b64d98d2030eba
treec3fa2e62903dd9081cd0d3aa600b2f7f732f87bc
parentb3520a4ae70571f7fa656f01cbe87c3df4a8a635
parent424a19b106003a55d1fbe857a2c66a3ba6450fd3
Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle

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