Merge branch 'MDL-47995-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE
commitc2a0ce47dbfd89d54a707ed6ed58ba86162dfefb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jun 2015 09:11:35 +0000 (3 11:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jun 2015 09:11:35 +0000 (3 11:11 +0200)
tree35ffd3e481315ecf4a523f4a0fe614d024f0e0b8
parent31aa2496d191db986eb32f55fe75f8aa789d4385
parent127b75e1610a126c95e8ab6fee283cd6320b9fde
Merge branch 'MDL-47995-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE