Merge branch 'MDL-34590_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit659a30df30bd50dee59968f8dea5f138647aa992
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 02:11:33 +0000 (6 10:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 02:11:33 +0000 (6 10:11 +0800)
tree5d02d08e1c747054fa8a9b172c7a9afb259ca730
parentc574b5dddd1133ed24b6b4f982d7782b662cfb08
parent92b7cdd0523af8f19d9aa0dbccf9f53b61ecfd4e
Merge branch 'MDL-34590_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE