Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 03:55:55 +0000 (11:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 03:55:55 +0000 (11:55 +0800)
commitbf48be3c7cf4dd660a1aaf6896552372a5ce4eb3
treeb577da9ae0b255e1a35802cd60a5d16898a63d24
parentb23fcda2b9ac2f8943edd833ff20d312fd9de052
parent1207ae1a34daad20ae9b386c61512325bcd808b3
Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle