Merge branch 'wip-MDL-46812_master' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 06:03:00 +0000 (14:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 06:03:00 +0000 (14:03 +0800)
commitbb918c0e942f7cd5532303c3ed2a46b5c21bd582
treee0455bbd5883a08252ec5ff2a3b6241749695263
parentb04dbae3fed07d47646656f95669ac344990b3a0
parent8c97393ce531d87a07f81cb8396dbe9d60159613
Merge branch 'wip-MDL-46812_master' of git://github.com/lazydaisy/moodle