Merge branch 'MDL-29428_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitded9134e03b84f9d3b198610673b2d2b148e4bf6
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 01:04:15 +0000 (26 14:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 01:04:15 +0000 (26 14:04 +1300)
tree99dd67be9b94caa861a6464e8914978bcde9dad6
parentd496829c61d6fdfac0ee5689c8ff6536c37350e5
parenta9384ab0d0452717f280f04818e01fe98c7ef949
Merge branch 'MDL-29428_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE