Merge branch 'MDL-26384-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Feb 2012 23:48:32 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Feb 2012 23:48:32 +0000 (00:48 +0100)
commite80898b52553f21d40fe4ab0d781320828cd56bb
tree40ad980fe4b0284f303bfcc29dcd1b065288bd3e
parent1208c6bb72759aa11e0e19ef595acc4c6d2aaea2
parent752582564884af9e34665b04a7e5e42e51962058
Merge branch 'MDL-26384-master' of git://github.com/ankitagarwal/moodle