Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 22:58:02 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 22:58:02 +0000 (00:58 +0200)
commitd29afc45779e5bb7b118d8008cad2d746940f984
tree7a4a70185cbf2c0ed237e748a8cfd6d09a8df563
parent5df002ad6874487075f440af843aca9604b0d16f
parentc2bb7f6007d50de6d1144da479c0f7dc9f9a71fb
Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle