Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 08:57:34 +0000 (16:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 08:57:34 +0000 (16:57 +0800)
commite4af9616c3335d1804ee44d1be8dffb2d2c4cad9
tree07443859231b148d5b268729be09e2b0a51bd560
parent6bce5b846a42faa4d20928d0f4c55f447fd84b7e
parentc8a661098ee3899590b2e7dbfa6cb1c56fba4b08
Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle