Merge branch 'MDL-45031_M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE
commit2c3eea86fad54608df8eba3f042b466f240de6e6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:33:03 +0000 (13 00:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:33:03 +0000 (13 00:33 +0200)
treea61b3aa9763d05223c2974ddfbf1594b7e7aa68d
parent39259ea58b221c0df19466885719ae333ba63f71
parent11b6abd02cf40a856996d123bcdbc29aca3981d6
Merge branch 'MDL-45031_M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE