Merge branch 'MDL-49764_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 14:28:48 +0000 (15:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 14:28:48 +0000 (15:28 +0100)
commit7b88b853922612c296a46527977c6f6a239fc811
tree2f4983692e2b72e51f64a8b1330c85d4aeaf98e5
parent62fc688baca887512e6aaf73658906e15b0caa4d
parent75a548b5f3bf65a2d90a8a9fd7b7e298be63068c
Merge branch 'MDL-49764_master' of https://github.com/jinhofer/moodle