Merge branch 'MDL-31616' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:14:03 +0000 (20:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:14:03 +0000 (20:14 +0100)
commitee5c647e84d11b75831596894cc7193e51d6e6d7
treece6b79dfbb3120fe7b1312410a13965a5ede235c
parentdcb21e6cc132b7f6da2aa223df03ed27bee53557
parentf187622a0d26c4931a2079ce3b02e999db16f66b
Merge branch 'MDL-31616' of git://github.com/timhunt/moodle