Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 01:56:59 +0000 (09:56 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 01:56:59 +0000 (09:56 +0800)
commitbd80fcc3579d8dcf120edbc82dc9ef4c08ceece2
tree6903777dc56725df24bbe62c406262b089c4f360
parent1d762c8aba9a918ba2434100e3f43197875f750c
parent73321216a136336586c800a8e9b438eaad034b87
Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle