Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 30 Sep 2013 07:57:30 +0000 (17:57 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 30 Sep 2013 07:57:30 +0000 (17:57 +1000)
commite6ec2366a8ee1a1db9c8447496d141a24bfe0391
tree4d650d0dcc575ea66ab8460021e033851696b54c
parent50ae8814e4b04a7a6d39684c3d16492ecc7f412c
parentb07ef13be28826efad413764fb231ff97e59be55
Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle

Conflicts:
mod/upgrade.txt
lib/moodlelib.php
mod/upgrade.txt