Merge branch 'MDL-45205-master-option2' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Apr 2014 13:26:37 +0000 (15:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Apr 2014 13:26:37 +0000 (15:26 +0200)

Trivial merge