Merge branch 'MDL-32324' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 21 Aug 2013 00:28:47 +0000 (10:28 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 21 Aug 2013 00:28:47 +0000 (10:28 +1000)

Trivial merge