Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 05:31:16 +0000 (13:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 05:31:16 +0000 (13:31 +0800)

Trivial merge