Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 22:19:04 +0000 (00:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 22:19:04 +0000 (00:19 +0200)
commita9285cd5d4d9c49967f5ba3480b646165df7d431
tree7e87b00939c0cdc320208876dcc1644f8b6c7789
parent62652cdc6356fe88e9bf251e6df6b2fe682561b7
parentd005d718816b2a3613f1604c9d36454199bb8343
Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle