Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:13:18 +0000 (18:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:13:18 +0000 (18:13 +0200)
commit8d0703d643f88f79520da93702970bf06d7b7325
tree2f925dbc3fb54d8e89f1a759e0a2044e0f77824b
parent8707dae4f8cb9b3731767aa93e8007aef2fef32a
parent9b4162fb1d3045dd69e863a7a48d7165491cc886
Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle