Merge branch 'MDL-31934_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 21:15:44 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 21:15:44 +0000 (10:15 +1300)
commiteecddb8fd47877fc0cbaa212ed66011703b1b20e
treecff1b57e1d504f7521616112eb9604e152b9fb87
parent639a2868c3417a81afaaad1ec9beee7e5cb46349
parentd895d70f9e867409fcbecc32b719d9831de97db4
Merge branch 'MDL-31934_master' of git://github.com/lazydaisy/moodle