Merge branch 'MDL-34209-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commite9f8075b54c18b164cf04f44825796c241a5569e
authorDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 05:58:28 +0000 (21 13:58 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 05:58:28 +0000 (21 13:58 +0800)
tree75501174ff6fde14ba2686107b3dc747da0459b1
parent94b2dbb9b5e0da5efddf9eb496865d5fb2fe3d89
parentdc9159d70a399e596c96d41dc92b95b2dacf30d3
Merge branch 'MDL-34209-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE