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)
commitb69e9d87242049656368d9689acb7e12c75479cc
tree935d484b3b06e60f26e6d064b7a6e0edb4162e8c
parent95f7bd8c0d866f87e593b68276d5b2ba15dfca2b
parent452ef534287d54b95f6433feba2c5aeabbe197b6
Merge branch 'MDL-45205-master-option2' of git://github.com/danpoltawski/moodle