Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:21:13 +0000 (10:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:21:13 +0000 (10:21 +1200)
commit83240842995222af6c3cfda5901b0f34bf7aa393
treed8471b477ebee90b4091afbe5d756fbf5c519fbf
parent94dab2abb3a32712ee23d489b592434ee641592e
parent886601cf450fa609925d2e8f3be396243100b1f0
Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle