Merge branch 'MDL-33932_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE
commit461499b836058b968db70e45ff713302dabb3d6b
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jul 2012 02:31:43 +0000 (2 14:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jul 2012 02:31:43 +0000 (2 14:31 +1200)
tree8e8eb543bdadb140bac2ff581ea44f15397a32de
parent803122e110a09bf482c65212b2176b0aaf663701
parent90e0da6f758e0cc8608702093fc5b0db72100a1b
Merge branch 'MDL-33932_22' of git://github.com/grabs/moodle into MOODLE_22_STABLE