Merge branch 'MDL-37539-master' of github.com:damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 01:10:47 +0000 (02:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 01:11:27 +0000 (02:11 +0100)
commitcccdddf2416a9556f05272c5e50a45cc704ab73f
tree9cafbcd7ae3021e902001f4a5a2cf6ff7f5c90d7
parent22aabad2d84cc61ad0a5541e89a00d915cf87757
parentf518843d4cab112a65eb7eed3666b259b401f080
Merge branch 'MDL-37539-master' of github.com:damyon/moodle