Merge branch 'MDL-41667' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:59:08 +0000 (08:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:59:08 +0000 (08:59 +1200)
commitf34af1167acb6696d188fb64a8b65336fd36a789
tree141a962584e4801c24c05879a3f41354419b4cf5
parent82b2bb5eca5bceb8e351265e5673fe774a80a1f7
parentca6fa1216ec893c3e45d8830cfbcdcb07ae85264
Merge branch 'MDL-41667' of git://github.com/timhunt/moodle