Merge branch 'MDL-32444_master' of git://github.com/lazydaisy/moodle
commit52bb02020d45abf3b11611ba3bc04a862221dcf5
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:59:55 +0000 (16 15:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:59:55 +0000 (16 15:59 +1200)
treefb386e1535211abffd201e8c4c29ad95d1d1ce81
parentd4e2d9463e9d8a62ad5dd408e02282db36d3999f
parent3689a8599b10baf7e637ad034cfc8297559b8842
Merge branch 'MDL-32444_master' of git://github.com/lazydaisy/moodle