Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 27 Aug 2012 06:20:15 +0000 (14:20 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 27 Aug 2012 06:20:15 +0000 (14:20 +0800)
commita1a5d8968efb1d254dc5b32c9a4ac0f4c07cdae5
tree49b8150ff331ccf1a6f02ff26a7dba0f5c461376
parentd835cdb6276e1a3db8193a88b79a57d94f921cd5
parentfd0680ff4a3506354aabb89272cafe687590dcf7
Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle