Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle
commit444ff605262c3eaca9f114518f434ca16f5d9f4c
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Oct 2014 07:47:10 +0000 (23 15:47 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:07 +0000 (24 11:48 +0200)
tree723905b6cc863037efcde4f004c70ce817b3e570
parent3824556c9abcd3bdba97df14ca1ee0a75c9e5791
parent8a0c64963735cb18f2f765b3fffc9f97b31a324f
Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle