Merge branch 'MDL-27555' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:50:50 +0000 (21:50 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:50:50 +0000 (21:50 +1000)

Trivial merge