Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle
commit086e5b7b9eaefd04a91f55679423baf6ed850855
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 07:12:56 +0000 (5 15:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 07:12:56 +0000 (5 15:12 +0800)
tree1305b4636a3a9f178d12b4b3beb1dfa842291d4a
parent5ab68de8f07bb0534a6c9ef40ee5d19b246e2637
parent0194d87ec505fb6173faa489d3f207de87c7b818
Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle