Merge branch 'MDL-30744_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit2253ea25926d0093fde9f6d45fa6dc071cf90ea9
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 21:53:57 +0000 (19 10:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 21:53:57 +0000 (19 10:53 +1300)
tree60052c09c1afc4399faa3e08c763f90901b4a5d9
parent5ff8144cc8ad3e8c7a025617310e8ea674c64656
parentf455e4e9bdcd102f0d19547993be42e1317107e1
Merge branch 'MDL-30744_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE