Merge branch 'MDL-27143_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commitbb0ece5a0c411828624dd47e810c43a247e57236
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 21:26:31 +0000 (13 10:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 21:26:31 +0000 (13 10:26 +1300)
tree1436f490cd45a8275ad151cfed089b311a2d7f40
parente79c09855ca853fab61d88b3f8d2a71e1fc8411b
parentd7320fc84a1427c485456ed1dae230ea07b857ea
Merge branch 'MDL-27143_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE