Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:19:53 +0000 (10:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:11 +0000 (11:48 +0200)
commit11531778512bfeafa863304acab9ae4a30fc9b4b
treea853840f0731c2791db4a9b4d14f67ff2671da0e
parent2a9bc5909d3279b87885f230c7d0ef682e9277f1
parent852ff0372fb6aa7350c115f5402a9477b4b0f1e6
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle