Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)
commitc7ed7235c764504c1f96b0907d93a94f4c0092b8
tree1a486f7be02f211a974588030651bf20a21b144e
parent2633f2362721d5e38a689980c16209f25770b7d3
parenta5e706e8fe64de1bcd7b5e7c95de9cf95138a734
Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle