Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 9 Apr 2013 06:30:52 +0000 (14:30 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 9 Apr 2013 06:30:52 +0000 (14:30 +0800)

Trivial merge