Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Aug 2013 19:00:12 +0000 (21:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Aug 2013 19:00:12 +0000 (21:00 +0200)
commit5c451460073dbeff9f625f6e25c5e3545ebb5b7c
treedf38b14638bdf0f7940a2ddc59890ef1e1360907
parentc718b49bfcf41ee7e66418bfc80dc45848dae100
parent1e0cb59ab547b787a8feabfd7f4559f12f589c89
Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle