Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 16:30:20 +0000 (17:30 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 16:30:20 +0000 (17:30 +0100)
commita96e90e1c0a4cee3dc701ed3bd2e96e307c146aa
treeb392e357ce8a46b8e58c6638e3b5556256ebb454
parent6315aa24f90bae4c6e842d7a47f1ba6258486357
parent0cc1ee1f3069743244cdc03ffc4063caa3c07a93
Merge branch 'MDL-46171-master-fix1' of github.com/damyon/moodle