Merge branch 'MDL-42624-master' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 08:00:33 +0000 (16:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 08:00:33 +0000 (16:00 +0800)
commit2c366f45cafa07bff41f2218a399999f45414f68
tree810533de6c350457ce3a96bdd84cd774514bd6ed
parent496422e34c9a26543a6ba7c9a87ae29a52e15881
parent6e2bf857c6e2a48ab0b73fc36bec41f8151b5f0c
Merge branch 'MDL-42624-master' of git://github.com/mouneyrac/moodle