Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Feb 2013 00:07:04 +0000 (01:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Feb 2013 00:07:04 +0000 (01:07 +0100)
commitd220e90fbf38fc1ef78da0e2df6fb424b48e983a
treee59edede78cec5b51391db24f844ecf25c5e3231
parente6a3f4ae27b4e7f6c8555fbfdb953fb04672554b
parentc5f609428d9518f250e4a29fa4d37c898876efaf
Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle