Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:21 +0000 (11:48 +0200)
commit7117571c348c454daf40d14c16ff9c650e01120b
tree874aab0055ac5a19473647d46b09483f21405a16
parent1e9756971359751ab117a8d9fe7ba03f5b1dd15a
parent6fa877e24382cb44dfe25fd3edc1896367d6eb77
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle