Merge branch 'MDL-33434_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
commit5411ca9e4077f5e8dc310a76415fc9bcac7b9f0c
authorDan Poltawski <dan@moodle.com>
Thu, 31 May 2012 08:59:37 +0000 (31 16:59 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 31 May 2012 08:59:37 +0000 (31 16:59 +0800)
tree8677193d8c4317c8194600b5eeb3b4cce2e4ec94
parented2b8be31a2f267f904152d24e55ec5e67bd63ba
parent21bb3f94668e0ffdde38132ffad03d279acf670d
Merge branch 'MDL-33434_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE