Merge branch 'MDL-27619_master' of git://github.com/pauln/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 22:10:05 +0000 (11:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 22:10:05 +0000 (11:10 +1300)

Trivial merge