Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 12:09:38 +0000 (13:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 12:09:38 +0000 (13:09 +0100)
commit83ab09a0010b8e620cdc22082d26229eb6e68433
tree0dadcaf52df8a79d76de5f187cb3624544d85533
parentc365148292e2cb62716e254b27e26f19cfc77fbf
parent8753653bdb5328e0ecf4eb2525ad0ce263bb4d72
Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle