Merge branch 'MDL-36683' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 00:33:39 +0000 (01:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 00:33:39 +0000 (01:33 +0100)
commit9e3f733f8ad559df7edd4eae8f6c6a435f8d52da
tree9d67eea6474079aa61ab701abe113a0b54744c34
parent0d463df0728ad54328bbeb1430074472139747b4
parentacb9f7f47d925ccb40a42fafed3abd803210dfc0
Merge branch 'MDL-36683' of git://github.com/timhunt/moodle