Merge branch 'MDL-48383-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE
commit01f200ad3975f5cdf946d42a004399b44ff87f71
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 11:01:24 +0000 (27 12:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 11:01:24 +0000 (27 12:01 +0100)
treed629058fbc57901b00cdd9fc44487e063233a76a
parent97f243a91646d187050e0e693edd9f5436c2af37
parent737a5f7fe482a20dc60aba2c59fe49bd6854d6c7
Merge branch 'MDL-48383-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE