Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:08:55 +0000 (09:08 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:08:55 +0000 (09:08 +1200)
commit18a1f186db87adff8589a4e387ccc0b1341b396f
tree75f02b2a5b740fcb1cbf39e69ed2246dd6ecc89d
parentcc5468de0e5fca96790fcb72c1377dc092405c27
parent1bd756b337af734db58344f583533d9686561a3a
Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle