Merge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 16:57:35 +0000 (18:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 16:57:35 +0000 (18:57 +0200)
commit7415646bcd51cb12fda030506bfd30d36d70503e
treedc851cda3c2dfe6b5326695d441a06d302293881
parent0c689b02fbf40d03bc34bf91c14c4bfe51b69671
parent82cca1ab16538c0a31268a873a2fbef81b73a572
Merge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle