Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 11:36:22 +0000 (19:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 11:36:22 +0000 (19:36 +0800)
commitc575842ce93cfdd0fc19e6832cb060b322fef224
tree612b7fe68398d7014a79a5e4f60fbc556a0d1bd0
parent5649520d9bfe05d939af73703350c0047ae73e30
parentae860173395eb30caac0fbfff8f86120caace11f
Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle