Merge branch 'MDL-37431' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:16:18 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:16:18 +0000 (00:16 +0100)
commitca2dfd0070aab59e757b50dad61fa2cc0a9a4399
tree8a8f77bef676d9fa27298afe9f6eb4c0cb125ef7
parenteaa00a071ca6f2dd974c990072da1d4e8ff0ec59
parent016a65157884e37248dc439f40f3d5904fdbda4d
Merge branch 'MDL-37431' of git://github.com/timhunt/moodle