Merge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 01:49:05 +0000 (09:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 01:49:05 +0000 (09:49 +0800)
commit4950f166d5941ad8bea5bf8e08e7d64a9ae17da3
treec85aa0856e17bd024fa28d4c962d442d28715df7
parentca0ceacd27b10c277489c46d2438c59a1ee194c4
parent1c4f42e1b240f22266b2de626eaba21376108b01
Merge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle