Merge branch 'MDL-34257_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit4fd7c545cc321d59997d4b0d2b1e93f5a41150ed
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:45:44 +0000 (2 10:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:45:44 +0000 (2 10:45 +1300)
tree3031412bcd5f9a4baa4ca73dc924b5a654afc2b0
parent60bbf9897114d5486d1dfae3510b18ccca640219
parente65f54f289f8debb5e78d59cd20b949b239351fd
Merge branch 'MDL-34257_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE