Merge branch 'MDL-34164_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit62b488086b0c56033e1c0b23a02ca6e1736bdeb9
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 02:05:59 +0000 (16 10:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 02:05:59 +0000 (16 10:05 +0800)
tree2eba56c09276ee1ee2b21148d57cf7356e496164
parentf1cb47f9a38ec2a5cb193d86479f3afb5c57a9c7
parent03c558af10e25950c9540e27654f9936099b496d
Merge branch 'MDL-34164_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE