Merge branch 'MDL-43265_new' of https://github.com/jacks92/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:55:52 +0000 (23:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:55:52 +0000 (23:55 +0100)
commit8167063ac121f71f395ba7f73bbe5206e8c87b50
treed56239d857c519b525984a0f4906c6a852358669
parent33ce661816c37f6f03a52737ed7331cf4869e477
parentd7730f16f857ef948b37a7940b10c0a18d7ff55b
Merge branch 'MDL-43265_new' of https://github.com/jacks92/moodle