Merge branch 'MDL-31487' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 11 Aug 2013 23:02:48 +0000 (11:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 11 Aug 2013 23:02:48 +0000 (11:02 +1200)
commit61bec33f53704994cb750d65ba48ebf0bc381418
tree6d0973cd748b8b999ff7548e9a1388e79f449ae2
parent45f133884e7297a61dd6a1ac2ac920f11033951a
parent39873128830bcee096c7091e274c269a94400971
Merge branch 'MDL-31487' of git://github.com/timhunt/moodle