Merge branch 'MDL-39412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 02:12:36 +0000 (12:12 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 02:12:36 +0000 (12:12 +1000)
commitd5bba86435a48140c0c7e13707ba758224d38f4e
tree16cb9a878f3de2ac5a14f4afa56f8ae3c8d3fab9
parentbb059c31adde2e797ecd171ef8fa86341a2843a5
parent95f982b0ac681e74b10918da54b731080d03c02e
Merge branch 'MDL-39412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE