Merge branch 'MDL-25953-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 04:01:49 +0000 (12:01 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 04:01:49 +0000 (12:01 +0800)
commit1b77cda09e75ac962606f6261c4fe9fa9f236c2d
tree201d34ea1a774e0990fa2ded5207882e4955a422
parent7cd1c5251a01bc05096a340aa5a795a55ea616f6
parentb061530d66ea4d7a69ac8c60bcc7a9b72061a55f
Merge branch 'MDL-25953-master' of git://github.com/FMCorz/moodle