Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit56d47558ff3c0b43cdddfba498c773a0d4ccc039
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 09:04:48 +0000 (28 17:04 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 09:04:48 +0000 (28 17:04 +0800)
tree97255d4cc194a0e3c33890fe9b6859bf55a2eb8e
parent0639b9ca1a6fe2e56d7deb407fdcb42432083676
parent6d24c26b5240293e1a2890343d09412b358e7a22
Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE