Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:43:47 +0000 (01:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:43:47 +0000 (01:43 +0100)
commite24066ff85a9e2a1525abbd2aebb44a74d89216a
tree905db7374a28901212d2704c67b2da00debe8a43
parentfbc4839a0ca8dfd307df88fa29897c9d972fa26d
parentb6094131541f922d2f1139064de72caf7eda8461
Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle