Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 12:19:21 +0000 (13:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 12:19:21 +0000 (13:19 +0100)
commitc897e4639c1b33ef3bb1c0f537b7076cdc30b68a
tree82f09c44c235d458ba6eeaa8b055edf327b2dc53
parent9002363b351bee130b0389aedd05e4f1d653484d
parent7b5abb50ce5f895ae26d57c094232a1c59ef8e09
Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle