Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:50:43 +0000 (16:50 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:50:43 +0000 (16:50 +0800)
commit41b9392daa26b06a5a6cba2d4b30a64f8dc2ad25
tree5a6010b52f24ba0b8215a965ddcade19f5c14cab
parentb8eb2f3dc6ed80e0e204019794502e8d0c878272
parent46b086f1456c280e6d2365a42ec09e1cfef4b797
Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle