Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 02:03:23 +0000 (10:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 02:03:23 +0000 (10:03 +0800)
commit2c36da50bc18d7e2f941b03146daae2707a0f255
tree7760bfa0cc2ff1230d3e8acd0bcb599c6f6d637d
parent70cb1b995bdbc85d1df904406f3b1d152ff112d1
parent2e1e266c9a99f94faed219c6d6b466f8d286759d
Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle

Conflicts:
version.php
version.php