Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:27:47 +0000 (12:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:27:47 +0000 (12:27 +0800)

Trivial merge