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)

Trivial merge