Merge branch 'MDL-31708-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_S...
authorAparup Banerjee <aparup@moodle.com>
Wed, 31 Oct 2012 02:05:26 +0000 (10:05 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 31 Oct 2012 02:05:26 +0000 (10:05 +0800)

Trivial merge