Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle
commit5cff835bd677e8c16de00d6e8039c65965d3981c
authorMarina Glancy <marina@moodle.com>
Wed, 19 Mar 2014 07:54:07 +0000 (19 15:54 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 20:22:25 +0000 (19 21:22 +0100)
tree2b43ce9d72111527e9041779c67b7867876b7518
parent3c9535dd940251558901b1bd5f6fae6e8616e987
parent2f4cf9a1daa5143f0a8002fa011889645fdd08ce
Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle