Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
commit2a9bc5909d3279b87885f230c7d0ef682e9277f1
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 09:16:44 +0000 (23 17:16 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:11 +0000 (24 11:48 +0200)
treef735ba4284940c7c4ef2a6a7f1752ef8af349aa2
parentbb030ebc2af5073d4c2b4a4e56c92009f089dec9
parent555837c5d4a844436826eb24af06d8dc07877e6c
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle