Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:35:05 +0000 (15:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:35:05 +0000 (15:35 +0100)
commit96b997d759318c60099788b65f03681ffc765608
tree1032b61f65dd7ca66ee0e33e41e481ca5e746d69
parent38e4fa58d5f8ac76b7d0e5e44e561d2d80c65475
parent0b33e91cd61fd757c3d7f03d12a73612713332f9
Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle