Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)
commit365e80ba7680270dbac72d0c974ec4cf5166870c
treea025b1e647305fffd7818e995372a9a911a821e1
parentce61d62c5ef001d913103279addb4c2b37f51e79
parent846abed55f1e1c045719cbdb50c95539e1c5845c
Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle