Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 06:57:48 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 06:57:48 +0000 (14:57 +0800)
commitbb179ab9b4d9972c67268048aae1cf7b72bbd935
tree0111999b29751db3f37ad9fae4442f317daafc04
parent70913901645389a77a059bee54aee718f8f85e2b
parent0b287dd2e8e3d4c8e3ad5282ddf4600601eef1a2
Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle