Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 22:58:44 +0000 (11:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 22:58:44 +0000 (11:58 +1300)
commita82a42b6c1bcd070c502e6a6470d5d3a3823d74f
treea053db04632e23bc27aac2bc84229e4dadaef158
parent0abe89f7b4cf1ec5c028c3dd6b78b74641523607
parentffd5e66e0e82dad4bd0fd45f3724934c52fd3425
Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle