Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 01:57:35 +0000 (09:57 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 01:57:35 +0000 (09:57 +0800)
commit753199ba63f09d9d903bdc33841fccd1923b5f10
tree3589b803ba4defea56ffc64c75be1a7c27bdba6d
parent6347a6216d919316ae8f71b29a6c02983d662250
parent4c88645920fab4e76fd265174843b4c1bcf022c5
Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle