Merge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 31 May 2012 07:11:25 +0000 (15:11 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 31 May 2012 07:20:53 +0000 (15:20 +0800)
commit267080d4ea4cd8cc419838e7a4c88361f19858eb
treef478944a0b23e06da3f02d8a8c6d341d2f9d8a83
parentffbe29a6bd39e51b654def1715c8877df0331409
parenteb7b030a8bd487b10e6d59cad6d7123ec45d2f20
Merge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle