Merge branch '44205-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:20:10 +0000 (01:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:20:10 +0000 (01:20 +0100)
commit6151f9de4cef6fe55d191aa8869ddbaa654325ca
treeefe0a4e4a0798cc0b341e105736da6240fbab12b
parentbb0949467e38e885a1ac945a5e51368731e37dc5
parent5b43c2afe0a5774e0021ae2c9332bf61f123d792
Merge branch '44205-27' of git://github.com/samhemelryk/moodle